网页端：修改整体统计

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -169,7 +169,7 @@ public class CmcContractController extends BaseController
                     paidMonthAmountObject.put(monthList.get(i), paidMonthAmount);
                 }
             }
-            cmcContract.setSignDate(null);
+            cmcContract.setContractCode(null);
         }
         else if (cmcContract.getSignDate() != null) {
             //输入年份合同数量及金额

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractMapper.xml

@@ -166,12 +166,6 @@
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
-            <if test="params.beginTime != null and params.beginTime != ''">
-                and date_format(t1.sign_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-            </if>
-            <if test="params.endTime != null and params.endTime != ''">
-                and date_format(t1.sign_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-            </if>
         </where>
         group by t1.contract_id
         order by t1.draft_time desc

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -85,8 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) != '2000' "> and YEAR(da.apply_date) = YEAR(#{applyDate})</if>
             <if test="params.beginTime != null and params.beginTime != '' and applyDate != null"> and MONTH(da.apply_date) = MONTH(#{applyDate})</if>
             <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != '' and applyDate == null">
-                and date_format(da.begin_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-                and date_format(da.end_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                and date_format(da.apply_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                and date_format(da.apply_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="returnDate != null "> and da.return_date = #{returnDate}</if>
             <if test="beginDate != null "> and da.begin_date = #{beginDate}</if>

oa-ui/src/views/statistics/components/topHead.vue

@@ -95,12 +95,11 @@
 <script>
 import upSrc from '@/assets/icons/up.png'
 import downSrc from '@/assets/icons/down.png'
-import * as echarts from 'echarts'
 import { echartsInit } from '@/utils/echarts'
-import { listProject } from '@/api/oa/project/project'
-import { listContract } from '@/api/oa/contract/contract'
-import { listBorrow } from '@/api/oa/borrow/borrow'
-import { listDeviceApproval } from '@/api/oa/device/deviceApproval'
+import { getProjectStatistic } from '@/api/oa/project/project'
+import { getContractStatistic } from '@/api/oa/contract/contract'
+import { getBorrowStatistic } from '@/api/oa/borrow/borrow'
+import { getDeviceStatistic } from '@/api/oa/device/device'
 
 let thisYearChart, contractYearChart, deviceYearChart, borrowYearChart, settleYearChart
 export default {
@@ -185,7 +184,8 @@ export default {
       deviceMonthLabels: [],
       deviceMonthThisYear: [],
       deviceMonthLastYear: [],
-      loading: true
+      loading: true,
+      statsLoading: false
     }
   },
   watch: {
@@ -251,18 +251,30 @@ export default {
     }
   },
   created() {
+    this.loadHeadStats()
   },
   mounted() {
   },
   methods: {
-    async initDatas() {
+    async loadHeadStats() {
+      if (this.statsLoading) {
+        return
+      }
+      this.statsLoading = true
       this.loading = true
-      await Promise.all([
-        this.loadProjectStats(),
-        this.loadContractStats(),
-        this.loadBorrowStats(),
-        this.loadDeviceStats()
-      ])
+      try {
+        await Promise.all([
+          this.loadProjectStats(),
+          this.loadContractStats(),
+          this.loadBorrowStats(),
+          this.loadDeviceStats()
+        ])
+      } finally {
+        this.loading = false
+        this.statsLoading = false
+      }
+    },
+    initDatas() {
       if (Object.keys(this.pDatas).length !== 0) {
         this.year = this.pDatas.year[0];
         this.type = this.pDatas.type[0];
@@ -293,229 +305,131 @@ export default {
         this.settleYear = this.sDatas.year[0];
         this.getSettleYearSub(this.settleYear);
       }
-
-      this.loading = false
     },
-    getMonthRange(year, month, capToToday = false) {
-      const monthStr = String(month).padStart(2, '0')
-      const begin = `${year}-${monthStr}-01`
-      const lastDay = new Date(year, month, 0).getDate()
-      let end = `${year}-${monthStr}-${String(lastDay).padStart(2, '0')}`
-      if (capToToday) {
-        const now = new Date()
-        if (year === now.getFullYear() && month === now.getMonth() + 1) {
-          end = this.parseTime(now, '{y}-{m}-{d}')
-        }
-      }
-      return [begin, end]
+    getMonthKey(year, month) {
+      return `${year}-${String(month).padStart(2, '0')}`
     },
-    async fetchProjectCount(begin, end) {
-      const res = await listProject(this.addDateRange({ pageNum: 1, pageSize: 1 }, [begin, end]))
-      return res.total || 0
+    getMonthValue(monthData, year, month) {
+      return Number(monthData[this.getMonthKey(year, month)] || 0)
     },
-    async loadProjectStats() {
-      const now = new Date()
-      const year = now.getFullYear()
-      const today = this.parseTime(now, '{y}-{m}-{d}')
-      const thisYearBegin = `${year}-01-01`
-      const lastYearBegin = `${year - 1}-01-01`
-      const lastYearDate = new Date(now)
-      lastYearDate.setFullYear(year - 1)
-      const lastYearToday = this.parseTime(lastYearDate, '{y}-{m}-{d}')
-      const currentMonth = now.getMonth() + 1
-      const lastMonthDate = new Date(year, now.getMonth() - 1, 1)
-      const lastMonthYear = lastMonthDate.getFullYear()
-      const lastMonth = lastMonthDate.getMonth() + 1
-      const [thisMonthBegin, thisMonthEnd] = this.getMonthRange(year, currentMonth, true)
-      const [lastMonthBegin, lastMonthEnd] = this.getMonthRange(lastMonthYear, lastMonth)
-
-      const monthTasks = []
-      const monthLabels = []
-      for (let m = 1; m <= currentMonth; m++) {
-        monthLabels.push(`${m}月`)
-        const [begin, end] = this.getMonthRange(year, m, m === currentMonth)
-        const [lastBegin, lastEnd] = this.getMonthRange(year - 1, m, false)
-        monthTasks.push(this.fetchProjectCount(begin, end))
-        monthTasks.push(this.fetchProjectCount(lastBegin, lastEnd))
+    parseMonthSeries(monthData, year, upToMonth) {
+      const labels = []
+      const values = []
+      for (let m = 1; m <= upToMonth; m++) {
+        labels.push(`${m}月`)
+        values.push(this.getMonthValue(monthData, year, m))
       }
-
-      const [thisYearCount, lastYearCount, thisMonthCount, lastMonthCount, ...monthCounts] = await Promise.all([
-        this.fetchProjectCount(thisYearBegin, today),
-        this.fetchProjectCount(lastYearBegin, lastYearToday),
-        this.fetchProjectCount(thisMonthBegin, thisMonthEnd),
-        this.fetchProjectCount(lastMonthBegin, lastMonthEnd),
-        ...monthTasks
-      ])
-
-      this.projectNum = thisYearCount
-      this.subYear = Math.abs(thisYearCount - lastYearCount)
-      this.isProjectUp = thisYearCount >= lastYearCount
-      this.subMonth = Math.abs(thisMonthCount - lastMonthCount)
-      this.isProjectMonthUp = thisMonthCount >= lastMonthCount
-
-      this.projectMonthLabels = monthLabels
-      this.projectMonthThisYear = []
-      this.projectMonthLastYear = []
-      for (let i = 0; i < monthCounts.length; i += 2) {
-        this.projectMonthThisYear.push(monthCounts[i])
-        this.projectMonthLastYear.push(monthCounts[i + 1])
+      return { labels, values }
+    },
+    sumMonths(monthData, year, fromMonth, toMonth) {
+      let sum = 0
+      for (let m = fromMonth; m <= toMonth; m++) {
+        sum += this.getMonthValue(monthData, year, m)
       }
+      return sum
     },
-    async fetchContractCount(begin, end) {
-      const res = await listContract(this.addDateRange({ pageNum: 1, pageSize: 1 }, [begin, end]))
-      return res.total || 0
+    calcCompareStats(thisYearData, lastYearData, year, currentMonth) {
+      const thisYearCount = this.sumMonths(thisYearData, year, 1, currentMonth)
+      const lastYearCount = this.sumMonths(lastYearData, year - 1, 1, currentMonth)
+      const thisMonthCount = this.getMonthValue(thisYearData, year, currentMonth)
+      let lastMonthYear = year
+      let lastMonth = currentMonth - 1
+      if (lastMonth === 0) {
+        lastMonth = 12
+        lastMonthYear = year - 1
+      }
+      const lastMonthData = lastMonthYear === year ? thisYearData : lastYearData
+      const lastMonthCount = this.getMonthValue(lastMonthData, lastMonthYear, lastMonth)
+      return { thisYearCount, lastYearCount, thisMonthCount, lastMonthCount }
     },
-    async loadContractStats() {
-      const now = new Date()
-      const year = now.getFullYear()
-      const today = this.parseTime(now, '{y}-{m}-{d}')
-      const thisYearBegin = `${year}-01-01`
-      const lastYearBegin = `${year - 1}-01-01`
-      const lastYearDate = new Date(now)
-      lastYearDate.setFullYear(year - 1)
-      const lastYearToday = this.parseTime(lastYearDate, '{y}-{m}-{d}')
-      const currentMonth = now.getMonth() + 1
-      const lastMonthDate = new Date(year, now.getMonth() - 1, 1)
-      const lastMonthYear = lastMonthDate.getFullYear()
-      const lastMonth = lastMonthDate.getMonth() + 1
-      const [thisMonthBegin, thisMonthEnd] = this.getMonthRange(year, currentMonth, true)
-      const [lastMonthBegin, lastMonthEnd] = this.getMonthRange(lastMonthYear, lastMonth)
-
-      const monthTasks = []
-      const monthLabels = []
-      for (let m = 1; m <= currentMonth; m++) {
-        monthLabels.push(`${m}月`)
-        const [begin, end] = this.getMonthRange(year, m, m === currentMonth)
-        const [lastBegin, lastEnd] = this.getMonthRange(year - 1, m, false)
-        monthTasks.push(this.fetchContractCount(begin, end))
-        monthTasks.push(this.fetchContractCount(lastBegin, lastEnd))
+    applyCompareResult(result, prefix) {
+      const {
+        thisYearCount,
+        lastYearCount,
+        thisMonthCount,
+        lastMonthCount,
+        labels,
+        thisYearValues,
+        lastYearValues
+      } = result
+      const fieldMap = {
+        project: { num: 'projectNum', subYear: 'subYear', subMonth: 'subMonth', up: 'isProjectUp', monthUp: 'isProjectMonthUp' },
+        contract: { num: 'contractNum', subYear: 'contractSubYear', subMonth: 'contractSubMonth', up: 'isContractUp', monthUp: 'isContractMonthUp' },
+        borrow: { num: 'borrowNum', subYear: 'borrowSubYear', subMonth: 'borrowSubMonth', up: 'isBorrowUp', monthUp: 'isBorrowMonthUp' },
+        device: { num: 'deviceNum', subYear: 'deviceSubYear', subMonth: 'deviceSubMonth', up: 'isDeviceUp', monthUp: 'isDeviceMonthUp' }
       }
-
-      const [thisYearCount, lastYearCount, thisMonthCount, lastMonthCount, ...monthCounts] = await Promise.all([
-        this.fetchContractCount(thisYearBegin, today),
-        this.fetchContractCount(lastYearBegin, lastYearToday),
-        this.fetchContractCount(thisMonthBegin, thisMonthEnd),
-        this.fetchContractCount(lastMonthBegin, lastMonthEnd),
-        ...monthTasks
+      const fields = fieldMap[prefix]
+      this[fields.num] = thisYearCount
+      this[fields.subYear] = Math.abs(thisYearCount - lastYearCount)
+      this[fields.up] = thisYearCount >= lastYearCount
+      this[fields.subMonth] = Math.abs(thisMonthCount - lastMonthCount)
+      this[fields.monthUp] = thisMonthCount >= lastMonthCount
+      this[`${prefix}MonthLabels`] = labels
+      this[`${prefix}MonthThisYear`] = thisYearValues
+      this[`${prefix}MonthLastYear`] = lastYearValues
+    },
+    async fetchYearMonthData(fetchFn, year) {
+      const res = await fetchFn(year)
+      return res.data || {}
+    },
+    async loadProjectStats() {
+      const year = new Date().getFullYear()
+      const currentMonth = new Date().getMonth() + 1
+      const [thisYearRes, lastYearRes] = await Promise.all([
+        this.fetchYearMonthData(y => getProjectStatistic({ projectNumber: String(y) }), year),
+        this.fetchYearMonthData(y => getProjectStatistic({ projectNumber: String(y) }), year - 1)
       ])
-
-      this.contractNum = thisYearCount
-      this.contractSubYear = Math.abs(thisYearCount - lastYearCount)
-      this.isContractUp = thisYearCount >= lastYearCount
-      this.contractSubMonth = Math.abs(thisMonthCount - lastMonthCount)
-      this.isContractMonthUp = thisMonthCount >= lastMonthCount
-
-      this.contractMonthLabels = monthLabels
-      this.contractMonthThisYear = []
-      this.contractMonthLastYear = []
-      for (let i = 0; i < monthCounts.length; i += 2) {
-        this.contractMonthThisYear.push(monthCounts[i])
-        this.contractMonthLastYear.push(monthCounts[i + 1])
-      }
+      const thisYearData = thisYearRes.month ? thisYearRes.month[0] : {}
+      const lastYearData = lastYearRes.month ? lastYearRes.month[0] : {}
+      const { labels, values: thisYearValues } = this.parseMonthSeries(thisYearData, year, currentMonth)
+      const { values: lastYearValues } = this.parseMonthSeries(lastYearData, year - 1, currentMonth)
+      const compare = this.calcCompareStats(thisYearData, lastYearData, year, currentMonth)
+      this.applyCompareResult({ ...compare, labels, thisYearValues, lastYearValues }, 'project')
     },
-    async fetchBorrowCount(begin, end) {
-      const res = await listBorrow(this.addDateRange({ pageNum: 1, pageSize: 1 }, [begin, end]))
-      return res.total || 0
+    async loadContractStats() {
+      const year = new Date().getFullYear()
+      const currentMonth = new Date().getMonth() + 1
+      const fetchContractMonths = y => getContractStatistic({ signDate: `${y}-01-01` })
+      const [thisYearRes, lastYearRes] = await Promise.all([
+        this.fetchYearMonthData(fetchContractMonths, year),
+        this.fetchYearMonthData(fetchContractMonths, year - 1)
+      ])
+      const thisYearData = thisYearRes.monthCount ? thisYearRes.monthCount[0] : {}
+      const lastYearData = lastYearRes.monthCount ? lastYearRes.monthCount[0] : {}
+      const { labels, values: thisYearValues } = this.parseMonthSeries(thisYearData, year, currentMonth)
+      const { values: lastYearValues } = this.parseMonthSeries(lastYearData, year - 1, currentMonth)
+      const compare = this.calcCompareStats(thisYearData, lastYearData, year, currentMonth)
+      this.applyCompareResult({ ...compare, labels, thisYearValues, lastYearValues }, 'contract')
     },
     async loadBorrowStats() {
-      const now = new Date()
-      const year = now.getFullYear()
-      const today = this.parseTime(now, '{y}-{m}-{d}')
-      const thisYearBegin = `${year}-01-01`
-      const lastYearBegin = `${year - 1}-01-01`
-      const lastYearDate = new Date(now)
-      lastYearDate.setFullYear(year - 1)
-      const lastYearToday = this.parseTime(lastYearDate, '{y}-{m}-{d}')
-      const currentMonth = now.getMonth() + 1
-      const lastMonthDate = new Date(year, now.getMonth() - 1, 1)
-      const lastMonthYear = lastMonthDate.getFullYear()
-      const lastMonth = lastMonthDate.getMonth() + 1
-      const [thisMonthBegin, thisMonthEnd] = this.getMonthRange(year, currentMonth, true)
-      const [lastMonthBegin, lastMonthEnd] = this.getMonthRange(lastMonthYear, lastMonth)
-
-      const monthTasks = []
-      const monthLabels = []
-      for (let m = 1; m <= currentMonth; m++) {
-        monthLabels.push(`${m}月`)
-        const [begin, end] = this.getMonthRange(year, m, m === currentMonth)
-        const [lastBegin, lastEnd] = this.getMonthRange(year - 1, m, false)
-        monthTasks.push(this.fetchBorrowCount(begin, end))
-        monthTasks.push(this.fetchBorrowCount(lastBegin, lastEnd))
-      }
-
-      const [thisYearCount, lastYearCount, thisMonthCount, lastMonthCount, ...monthCounts] = await Promise.all([
-        this.fetchBorrowCount(thisYearBegin, today),
-        this.fetchBorrowCount(lastYearBegin, lastYearToday),
-        this.fetchBorrowCount(thisMonthBegin, thisMonthEnd),
-        this.fetchBorrowCount(lastMonthBegin, lastMonthEnd),
-        ...monthTasks
+      const year = new Date().getFullYear()
+      const currentMonth = new Date().getMonth() + 1
+      const fetchBorrowMonths = y => getBorrowStatistic({ lendTime: `${y}-01-01` })
+      const [thisYearRes, lastYearRes] = await Promise.all([
+        this.fetchYearMonthData(fetchBorrowMonths, year),
+        this.fetchYearMonthData(fetchBorrowMonths, year - 1)
       ])
-
-      this.borrowNum = thisYearCount
-      this.borrowSubYear = Math.abs(thisYearCount - lastYearCount)
-      this.isBorrowUp = thisYearCount >= lastYearCount
-      this.borrowSubMonth = Math.abs(thisMonthCount - lastMonthCount)
-      this.isBorrowMonthUp = thisMonthCount >= lastMonthCount
-
-      this.borrowMonthLabels = monthLabels
-      this.borrowMonthThisYear = []
-      this.borrowMonthLastYear = []
-      for (let i = 0; i < monthCounts.length; i += 2) {
-        this.borrowMonthThisYear.push(monthCounts[i])
-        this.borrowMonthLastYear.push(monthCounts[i + 1])
-      }
-    },
-    async fetchDeviceCount(begin, end) {
-      const res = await listDeviceApproval(this.addDateRange({ pageNum: 1, pageSize: 1 }, [begin, end]))
-      return res.total || 0
+      const thisYearData = thisYearRes.month ? thisYearRes.month[0] : {}
+      const lastYearData = lastYearRes.month ? lastYearRes.month[0] : {}
+      const { labels, values: thisYearValues } = this.parseMonthSeries(thisYearData, year, currentMonth)
+      const { values: lastYearValues } = this.parseMonthSeries(lastYearData, year - 1, currentMonth)
+      const compare = this.calcCompareStats(thisYearData, lastYearData, year, currentMonth)
+      this.applyCompareResult({ ...compare, labels, thisYearValues, lastYearValues }, 'borrow')
     },
     async loadDeviceStats() {
-      const now = new Date()
-      const year = now.getFullYear()
-      const today = this.parseTime(now, '{y}-{m}-{d}')
-      const thisYearBegin = `${year}-01-01`
-      const lastYearBegin = `${year - 1}-01-01`
-      const lastYearDate = new Date(now)
-      lastYearDate.setFullYear(year - 1)
-      const lastYearToday = this.parseTime(lastYearDate, '{y}-{m}-{d}')
-      const currentMonth = now.getMonth() + 1
-      const lastMonthDate = new Date(year, now.getMonth() - 1, 1)
-      const lastMonthYear = lastMonthDate.getFullYear()
-      const lastMonth = lastMonthDate.getMonth() + 1
-      const [thisMonthBegin, thisMonthEnd] = this.getMonthRange(year, currentMonth, true)
-      const [lastMonthBegin, lastMonthEnd] = this.getMonthRange(lastMonthYear, lastMonth)
-
-      const monthTasks = []
-      const monthLabels = []
-      for (let m = 1; m <= currentMonth; m++) {
-        monthLabels.push(`${m}月`)
-        const [begin, end] = this.getMonthRange(year, m, m === currentMonth)
-        const [lastBegin, lastEnd] = this.getMonthRange(year - 1, m, false)
-        monthTasks.push(this.fetchDeviceCount(begin, end))
-        monthTasks.push(this.fetchDeviceCount(lastBegin, lastEnd))
-      }
-
-      const [thisYearCount, lastYearCount, thisMonthCount, lastMonthCount, ...monthCounts] = await Promise.all([
-        this.fetchDeviceCount(thisYearBegin, today),
-        this.fetchDeviceCount(lastYearBegin, lastYearToday),
-        this.fetchDeviceCount(thisMonthBegin, thisMonthEnd),
-        this.fetchDeviceCount(lastMonthBegin, lastMonthEnd),
-        ...monthTasks
+      const year = new Date().getFullYear()
+      const currentMonth = new Date().getMonth() + 1
+      const fetchDeviceMonths = y => getDeviceStatistic({ applyDate: `${y}-01-01` })
+      const [thisYearRes, lastYearRes] = await Promise.all([
+        this.fetchYearMonthData(fetchDeviceMonths, year),
+        this.fetchYearMonthData(fetchDeviceMonths, year - 1)
       ])
-
-      this.deviceNum = thisYearCount
-      this.deviceSubYear = Math.abs(thisYearCount - lastYearCount)
-      this.isDeviceUp = thisYearCount >= lastYearCount
-      this.deviceSubMonth = Math.abs(thisMonthCount - lastMonthCount)
-      this.isDeviceMonthUp = thisMonthCount >= lastMonthCount
-
-      this.deviceMonthLabels = monthLabels
-      this.deviceMonthThisYear = []
-      this.deviceMonthLastYear = []
-      for (let i = 0; i < monthCounts.length; i += 2) {
-        this.deviceMonthThisYear.push(monthCounts[i])
-        this.deviceMonthLastYear.push(monthCounts[i + 1])
-      }
+      const thisYearData = thisYearRes.month ? thisYearRes.month[0] : {}
+      const lastYearData = lastYearRes.month ? lastYearRes.month[0] : {}
+      const { labels, values: thisYearValues } = this.parseMonthSeries(thisYearData, year, currentMonth)
+      const { values: lastYearValues } = this.parseMonthSeries(lastYearData, year - 1, currentMonth)
+      const compare = this.calcCompareStats(thisYearData, lastYearData, year, currentMonth)
+      this.applyCompareResult({ ...compare, labels, thisYearValues, lastYearValues }, 'device')
     },
     initChartOne() {
       let option = {