From 2dfdbb2318acbec541d3000e5df7651f3591bf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sat, 25 Mar 2023 19:43:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java  | 4 ++--
 .../modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java | 2 +-
 .../modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
index 54f3b6d80..06ee62fc6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
@@ -70,7 +70,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
                 if (null != kzqObj) {
                     try {
                         field.setAccessible(true);
-                        field.set(sjmk, kzqObj.toString());
+                        field.set(sjmk, kzqObj);
                     } catch (IllegalAccessException e) {
                         e.printStackTrace();
                     }
@@ -93,7 +93,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
             if (null != bjObj) {
                 try {
                     field.setAccessible(true);
-                    field.set(otaBaCxJsfzbacs, bjObj.toString());
+                    field.set(otaBaCxJsfzbacs, bjObj);
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
index 1359e5eec..145671342 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
@@ -48,7 +48,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                     if (null != bjObj) {
                         try {
                             field.setAccessible(true);
-                            field.set(otaBaCxJsfzbacs, bjObj.toString());
+                            field.set(otaBaCxJsfzbacs, bjObj);
                         } catch (IllegalAccessException e) {
                             e.printStackTrace();
                         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
index d642ec014..bb6b520e8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
@@ -47,7 +47,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
                     if (null != bjObj) {
                         try {
                             field.setAccessible(true);
-                            field.set(otaBaCxKsjxtmccs, bjObj.toString());
+                            field.set(otaBaCxKsjxtmccs, bjObj);
                         } catch (IllegalAccessException e) {
                             e.printStackTrace();
                         }

From e672895374e5024098c08caa2fc4c15a3fc1290f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Sat, 25 Mar 2023 19:46:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/safetyPrecautions.vue          |  9 ++---
 .../components/maintenance.vue                | 36 +++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index 5a29207a6..9af80e5f3 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -164,7 +164,7 @@ import ImportFile from '@/components/ImportFileData/index'
       }
     },
     mounted() {
-      this.getList()
+      // this.getList()
       this.getData()
     },
     methods: {
@@ -180,9 +180,10 @@ import ImportFile from '@/components/ImportFileData/index'
           getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
          if(res.code == 200){
          this.dataSource[0].info = Number(res.result.bhjz)
-        this.dataSource[1].info =Number(res.result.fsxjz)
-        this.dataSource[2].info= Number(res.result.sjsbcs)
-        this.dataSource[3].info=Number(res.result.xxaqjz)
+          this.dataSource[1].info =Number(res.result.fsxjz)
+          this.dataSource[2].info= Number(res.result.sjsbcs)
+          this.dataSource[3].info=Number(res.result.xxaqjz)
+           this.loading = false
          }
         })
       
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
index db43ddfe5..03eca8753 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
@@ -14,11 +14,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <!--              <span class="Required">*</span>-->
+                            <span class="Required">*</span>
               <span class="title-text-text" :title="$t('recordstatus')">
                 {{$t('recordstatus')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="recordstatus">
+            <a-form-model-item class="itemModel" prop="bazt">
               <j-dict-select-tag class="box-input" v-model="formInline.bazt"
                                  :placeholder="$t('PleaseSelect')+$t('recordstatus')"
                                  :type="'select'"
@@ -29,11 +29,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <!--              <span class="Required">*</span>-->
+                            <span class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="filingtime">
+            <a-form-model-item class="itemModel" prop="batjsj">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
@@ -80,20 +80,20 @@ export default {
         bz:'',
       },
       rules: {
-        // listConfirmation: [
-        //   {
-        //     required: true,
-        //     message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'),
-        //     trigger: 'change'
-        //   }
-        // ],
-        // legalTaskConfirmation: [
-        //   {
-        //     required: true,
-        //     message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'),
-        //     trigger: 'change'
-        //   }
-        // ],
+        bazt: [
+          {
+            required: true,
+            message: this.$t('recordstatus') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
+        batjsj: [
+          {
+            required: true,
+            message: this.$t('filingtime') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // designDeadline: [
         //   {
         //     required: true,