From ad7d54b9367bd37558af67d03d24e6196b671787 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Sat, 22 Jan 2022 18:09:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=91=8A):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=91=8A=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009783 --user=宋天阳 【报表统计】github#9565，报表统计的时间控件现在今天查询无法满足
https://www.tapd.cn/55049933/s/1096544
---
 .../metersphere/api/service/MockConfigService.java   |  2 +-
 .../casecount/filter/TestCaseCountFilter.vue         | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
index e5c274a048..bb741ca96a 100644
--- a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
@@ -1421,7 +1421,7 @@ public class MockConfigService {
                 mockExpect.setMockConfigId(mockConfig.getId());
                 mockExpect.setId(expectInDb.getId());
                 mockExpect.setUpdateTime(System.currentTimeMillis());
-                mockExpectConfigMapper.updateByPrimaryKey(mockExpect);
+                mockExpectConfigMapper.updateByPrimaryKeyWithBLOBs(mockExpect);
             }
 
         }
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue
index 855a2a917f..eb4ff7e5eb 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue
@@ -28,13 +28,13 @@
           <el-date-picker
             size="small"
             v-model="option.times"
+            align="right"
             type="datetimerange"
             value-format="timestamp"
             :range-separator="$t('api_monitor.to')"
             :start-placeholder="$t('commons.date.start_date')"
             :end-placeholder="$t('commons.date.end_date')"
-            :picker-options="datePickerOptions"
-            style="margin-left: 10px;width: 100%">
+            style="margin-right: 10px;width: 100%">
           </el-date-picker>
         </div>
         <div v-if="option.timeType === 'dynamicTime'" style="width: 70%;margin-left: 20px;float: left">
@@ -219,14 +219,6 @@ export default {
         id: 'id',
         label: 'label',
       },
-      datePickerOptions: {
-        disabledDate: (time) => {
-          let nowDate = new Date();
-          let oneDay = 1000 * 60 * 60 * 24;
-          let oneYearLater = new Date(nowDate.getTime() + (oneDay * 365));
-          return time.getTime() > nowDate || time.getTime() > oneYearLater;//注意是||不是&&
-        }
-      },
     };
   },
   created() {