From 289cc4777c2c8bc0d3c404a70df3ab9ccba66769 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Wed, 26 Apr 2023 11:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E9=94=80=E5=94=AE=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/industry/industryAdd.vue        |  24 ++-
 .../src/views/industry/industryInfo.vue       |  30 ++--
 .../src/views/projectType/projectTypeAdd.vue  |  25 ++-
 .../src/views/projectType/projectTypeInfo.vue |   2 +-
 .../src/api/report/salesstatisticsday.js      |  21 +++
 .../src/views/kucun/zhsj/index.vue            | 154 ++++++++++++------
 yxt-portal-ui/src/views/Home/Home.vue         |   4 +-
 .../ReportSalesStatisticsDayRest.java         |   4 +-
 8 files changed, 173 insertions(+), 91 deletions(-)
 create mode 100644 supervise-customer-ui/src/api/report/salesstatisticsday.js

diff --git a/supervise-crm-ui/src/views/industry/industryAdd.vue b/supervise-crm-ui/src/views/industry/industryAdd.vue
index 0df6459c..924468f5 100644
--- a/supervise-crm-ui/src/views/industry/industryAdd.vue
+++ b/supervise-crm-ui/src/views/industry/industryAdd.vue
@@ -33,21 +33,21 @@
 </template>
 
 <script>
-  import req from '@/api/dataDict/dataDict'
+  import req from '@/api/dataDict/datadict'
   export default {
     data() {
       return {
         submitdisabled: false,
         formobj: {
-          sid: "",
-          industryName: "",
-          remarks: ""
+          sid: '',
+          industryName: '',
+          remarks: ''
         }
       }
     },
     methods: {
       saveOrUpdate() {
-        console.log(">>>>>>>>>saveOrUpdate", this.formobj)
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
         if (this.formobj.sid) {
           req.updateindustry(this.formobj)
             .then(resp => {
@@ -57,13 +57,12 @@
                   type: 'success',
                   message: resp.msg
                 })
-                this.handleReturn("true")
+                this.handleReturn('true')
               } else {
                 // 根据resp.code进行异常情况处理
               }
             })
             .catch(() => {})
-
         } else {
           req.saveindustry(this.formobj)
             .then(resp => {
@@ -73,7 +72,7 @@
                   type: 'success',
                   message: resp.msg
                 })
-                this.handleReturn("true")
+                this.handleReturn('true')
               } else {
                 // 根据resp.code进行异常情况处理
               }
@@ -84,9 +83,9 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
-          sid: "",
-          industryName: "",
-          remarks: ""
+          sid: '',
+          industryName: '',
+          remarks: ''
         }
         this.$emit('doback')
       },
@@ -100,7 +99,6 @@
             if (resp.success) {
               this.formobj = resp.data
             }
-
           })
           .catch(e => {
             this.formobj = row
@@ -171,4 +169,4 @@
     }
 
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/supervise-crm-ui/src/views/industry/industryInfo.vue b/supervise-crm-ui/src/views/industry/industryInfo.vue
index 34ee3c58..e67b2d82 100644
--- a/supervise-crm-ui/src/views/industry/industryInfo.vue
+++ b/supervise-crm-ui/src/views/industry/industryInfo.vue
@@ -26,8 +26,13 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="handleSelectionChange">
+          <el-table
+            v-loading="tableLoading"
+            :data="dataList"
+            border
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+          >
             <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
             <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
             <el-table-column label="操作" align="center" width="180">
@@ -36,8 +41,8 @@
                 <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
               </template>
             </el-table-column>
-              <el-table-column prop="industryName" label="项目行业名称" align="center"  />
-            <el-table-column prop="remarks" label="项目行业说明" align="center"/>
+            <el-table-column prop="industryName" label="项目行业名称" align="center" />
+            <el-table-column prop="remarks" label="项目行业说明" align="center" />
 
           </el-table>
         </div>
@@ -45,8 +50,14 @@
         <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" />
+          <pagination
+            v-show="dataList.length > 0"
+            :total="queryParams.total"
+            :page.sync="queryParams.current"
+            :limit.sync="queryParams.size"
+            class="pagination"
+            @pagination="loadList"
+          />
         </div>
       </div>
     </div>
@@ -57,7 +68,7 @@
 </template>
 
 <script>
-  import req from '@/api/dataDict/dataDict'
+  import req from '@/api/dataDict/datadict'
   import ButtonBar from '@/components/ButtonBar'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
@@ -98,7 +109,7 @@
           size: 10,
           total: 0,
           params: {
-            industryName: '',
+            industryName: ''
           }
         },
         sids: []
@@ -173,7 +184,7 @@
            total: 0,
           params: {
             code: '',
-            name: '',
+            name: ''
           }
         }
         this.loadList()
@@ -188,7 +199,6 @@
         this.$refs['divadd'].showEdit(row)
       },
       toRelevancyInfo(row) {
-
         const tip = '请确认是否删除所选记录?'
         this.$confirm(tip, '提示', {
           confirmButtonText: '确定',
diff --git a/supervise-crm-ui/src/views/projectType/projectTypeAdd.vue b/supervise-crm-ui/src/views/projectType/projectTypeAdd.vue
index 331c9b4e..c2e7d81c 100644
--- a/supervise-crm-ui/src/views/projectType/projectTypeAdd.vue
+++ b/supervise-crm-ui/src/views/projectType/projectTypeAdd.vue
@@ -33,21 +33,21 @@
 </template>
 
 <script>
-  import req from '@/api/dataDict/dataDict'
+  import req from '@/api/dataDict/datadict'
   export default {
     data() {
       return {
         submitdisabled: false,
         formobj: {
-          sid: "",
-          typeName: "",
-          remarks: ""
+          sid: '',
+          typeName: '',
+          remarks: ''
         }
       }
     },
     methods: {
       saveOrUpdate() {
-        console.log(">>>>>>>>>saveOrUpdate", this.formobj)
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
         if (this.formobj.sid) {
           req.updateClass(this.formobj)
             .then(resp => {
@@ -57,13 +57,12 @@
                   type: 'success',
                   message: resp.msg
                 })
-                this.handleReturn("true")
+                this.handleReturn('true')
               } else {
                 // 根据resp.code进行异常情况处理
               }
             })
             .catch(() => {})
-
         } else {
           req.saveClass(this.formobj)
             .then(resp => {
@@ -73,7 +72,7 @@
                   type: 'success',
                   message: resp.msg
                 })
-                this.handleReturn("true")
+                this.handleReturn('true')
               } else {
                 // 根据resp.code进行异常情况处理
               }
@@ -84,9 +83,9 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
-          sid: "",
-          typeName: "",
-          remarks: ""
+          sid: '',
+          typeName: '',
+          remarks: ''
         }
         this.$emit('doback')
       },
@@ -100,7 +99,6 @@
             if (resp.success) {
               this.formobj = resp.data
             }
-
           })
           .catch(e => {
             this.formobj = row
@@ -171,4 +169,5 @@
     }
 
   }
-</style>
\ No newline at end of file
+</style>
+
diff --git a/supervise-crm-ui/src/views/projectType/projectTypeInfo.vue b/supervise-crm-ui/src/views/projectType/projectTypeInfo.vue
index 692f403b..8a4bf5b8 100644
--- a/supervise-crm-ui/src/views/projectType/projectTypeInfo.vue
+++ b/supervise-crm-ui/src/views/projectType/projectTypeInfo.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-  import req from '@/api/dataDict/dataDict'
+  import req from '@/api/dataDict/datadict'
   import ButtonBar from '@/components/ButtonBar'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
diff --git a/supervise-customer-ui/src/api/report/salesstatisticsday.js b/supervise-customer-ui/src/api/report/salesstatisticsday.js
new file mode 100644
index 00000000..193a7102
--- /dev/null
+++ b/supervise-customer-ui/src/api/report/salesstatisticsday.js
@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+// 日销售汇总
+export default {
+
+  // 查询近30天的列表
+  listOneMonth: function() {
+    return request({
+      baseURL: '/api/report',
+      url: '/sales/statistics/day/listOneMonth'
+    })
+  },
+  // 统计某天数据
+  countForDay: function(params) {
+    return request({
+      baseURL: '/api/report',
+      url: '/sales/statistics/day/countForDay',
+      method: 'get',
+      params: params
+    })
+  }
+}
diff --git a/supervise-customer-ui/src/views/kucun/zhsj/index.vue b/supervise-customer-ui/src/views/kucun/zhsj/index.vue
index 83e1aef7..d9fe04f9 100644
--- a/supervise-customer-ui/src/views/kucun/zhsj/index.vue
+++ b/supervise-customer-ui/src/views/kucun/zhsj/index.vue
@@ -6,71 +6,125 @@
       <div>{{ viewTitle }}</div>
       <!-- start 添加修改按钮 -->
       <div>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        <!-- <el-button type="info" size="small" @click="handleReturn()">关闭</el-button> -->
       </div>
       <!-- end 添加修改按钮 -->
       <!-- end 详情按钮 -->
     </div>
+    <div class="main-content" style="margin-top: 10px;">
+      <el-row :gutter="20">
+        <el-col :span="16">
+          <el-card class="box-card" :body-style="{ padding: '0px' }">
+            <div slot="header" class="clearfix">
+              <span>日销售金额汇总列表</span>
+            </div>
+            <div>
+              <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                <el-table-column fixed width="60" label="序号" type="index" align="center" />
+                <el-table-column prop="orderDate" label="数据日期" align="center" width="120" />
+                <el-table-column prop="zydAmount" label="直营店金额" align="center" width="150" />
+                <el-table-column prop="pifaAmount" label="批发金额" align="center" width="150" />
+                <el-table-column prop="jmdAmount" label="加盟店金额" align="center" width="150" />
+                <el-table-column prop="countAmount" label="合计金额" align="center" />
+              </el-table>
+            </div>
+          </el-card></el-col>
+        <el-col :span="8">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>选择日期汇总</span>
+            </div>
+            <div>
+              <el-date-picker v-model="tocountday" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" />
+              <el-button type="primary" style="margin-left: 10px;" @click="docount">重新汇总</el-button>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+
+    </div>
   </div>
 </template>
 
 <script>
-import req from '@/api/supervise/purchaseapplicationmanagement'
-export default {
-  name: 'PurchaseApplicationManagementInfo',
-  data() {
-    return {
-      submitdisabled: false,
-      viewTitle: '综合数据上报',
-      tableKey: 0,
-      index: 0,
-      totalQuantity: '', // 合计数量
-      amountInTotal: '', // 合计金额
-      formobj: {},
-      rules: {}
-    }
-  },
-  created() {},
-  methods: {
-    handleReturn() {
-      this.formobj = {}
-      this.$refs['form_obj'].resetFields()
-      this.$emit('doback')
+  import req from '@/api/report/salesstatisticsday'
+  export default {
+    name: 'KucunZhsj',
+    data() {
+      return {
+        submitdisabled: false,
+        viewTitle: '日销售金额汇总',
+        tableKey: 0,
+        index: 0,
+        totalQuantity: '', // 合计数量
+        amountInTotal: '', // 合计金额
+        formobj: {},
+        rules: {},
+        tableLoading: false,
+        dataList: [],
+        tocountday: new Date()
+      }
+    },
+    created() {
+      this.loadList()
     },
-    showInfo(row) {
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-      this.viewTitle = '【审核编号】详情'
-      req.fetchBySid(row.sid).then((resp) => {
-        if (resp.success) {
-          this.formobj = resp.data
-          if (this.formobj.pros.length > 0) {
-            this.totalQuantity = this.formobj.pros.length
-            var aa = 0
-            for (var i = 0; i < this.formobj.pros.length; i++) {
-              if (this.formobj.pros[i].totalPrice !== '') {
-                aa = parseFloat(aa) + parseFloat(this.formobj.pros[i].totalPrice)
+    methods: {
+      // 序号
+      // indexMethod(index) {
+      //   var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      //   var pageindex = index + 1 + pagestart
+      //   return pageindex
+      // },
+      loadList() {
+        req.listOneMonth().then(res => {
+          this.dataList = res.data
+        })
+      },
+      docount() {
+        const p = {
+          day: this.tocountday
+        }
+        req.countForDay(p).then(res => {
+          console.log('1111', res)
+          this.loadList()
+        }).catch(e => {
+          console.log('docount::::', e)
+        })
+      },
+      showInfo(row) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.viewTitle = '【审核编号】详情'
+        req.fetchBySid(row.sid).then((resp) => {
+          if (resp.success) {
+            this.formobj = resp.data
+            if (this.formobj.pros.length > 0) {
+              this.totalQuantity = this.formobj.pros.length
+              var aa = 0
+              for (var i = 0; i < this.formobj.pros.length; i++) {
+                if (this.formobj.pros[i].totalPrice !== '') {
+                  aa = parseFloat(aa) + parseFloat(this.formobj.pros[i].totalPrice)
+                }
               }
+              this.amountInTotal = aa
             }
-            this.amountInTotal = aa
+          } else {
+            // 根据resp.code进行异常情况处理
           }
-        } else {
-          // 根据resp.code进行异常情况处理
-        }
-      }).catch(e => {
-        this.formobj = row
-      })
+        }).catch(e => {
+          this.formobj = row
+        })
+      }
     }
   }
-}
 </script>
 
 <style scoped>
-.title {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
+  .title {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
 </style>
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index 697124dd..a6910b05 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -436,8 +436,8 @@
         if (index === 10) {
           window.open('/#/index', '_blank')
         } else if (index === 0) {
-          // window.open('http://192.168.3.8:9532/#/' + '?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/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/salesstatisticsday/ReportSalesStatisticsDayRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/salesstatisticsday/ReportSalesStatisticsDayRest.java
index 136fc8a3..125709eb 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/salesstatisticsday/ReportSalesStatisticsDayRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/salesstatisticsday/ReportSalesStatisticsDayRest.java
@@ -26,8 +26,8 @@ public class ReportSalesStatisticsDayRest {
         if (StrUtil.isBlank(day))
             return rb.setMsg("必须指定日期");
         try {
-            DateTime parse = DateUtil.parse(day, "yyyy-MM-dd");
-            if (parse.isAfterOrEquals(new Date())) {
+            String currDay = DateUtil.format(new Date(), "yyyy-MM-dd");
+            if (day.compareTo(currDay) >= 0) {
                 return rb.setMsg("只能统计之前日期");
             }
         } catch (Exception e) {