From 0e9eeee54db8f9be01c43eb704b1d7ba5a61c563 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 22 Mar 2024 17:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=A3=80=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E9=99=A9=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppSafetyMeetingController.java       |   3 +-
 .../datasource/beidou/BeidouMapper.xml        | 129 +++++++++++------
 .../maintenance/MaintenanceMapper.xml         | 136 +++++++++++-------
 3 files changed, 168 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java b/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java
index 713013a..8a794ad 100644
--- a/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java
+++ b/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java
@@ -62,8 +62,7 @@ public class AppSafetyMeetingController extends BaseController {
         return ReturnMap.ok().put("pd", meetPeopleByUId)
                 .put("people", safetyMeetingService.saftPersonList(pageData))
                 .put("imgs", imgFilesService.getListByKeyAndType(pageData.getString("SAFETY_MEETING_ID"), "105"))
-                .put("singImgs", imgFilesService.getListByKeyAndType(meetPeopleByUId.getString("SAFETY_MEETING_PEOPLE_ID"), "106"))
-                ;
+                .put("singImgs", imgFilesService.getListByKeyAndType(meetPeopleByUId.getString("SAFETY_MEETING_PEOPLE_ID"), "106"));
     }
 
     /**
diff --git a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml
index 12edd10..8f156c1 100644
--- a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml
+++ b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml
@@ -10,55 +10,90 @@
 
     <!-- 字段 -->
     <sql id="Field">
-BEIDOU_ID,
-CORPINFO_ID,
-NUM,
-VEHICLE,
-CAR_OWNERS,
-TELEPHONE,
-REGISTRANT,
-NETWORK_ACCESS_COMPANY,
-PROCESSING_DATE,
-DUE_DATE,
-ACTUAL_COLLECTION,
-ALL_FEES,
-REMINDER_DAYS,
-REMINDER_DATE,
-REMINDER_STATUS,
-BEIDOUINFO,
-NOTES,
-ARCHIVES_TYPE,
-ISDELETE,
-CREATOR,
-CREATORNAME,
-CREATTIME
-	</sql>
+        BEIDOU_ID,
+        CORPINFO_ID,
+        INDUSTRY_TYPE,
+        INDUSTRY_TYPE_TREE,
+        INDUSTRY_TYPE_NAMES,
+        OPER_CORP,
+        VEHICLE,
+        BASICINFO_LICENSE_PLATE,
+        BASICINFO_VIN,
+        BASICINFO_VEHICLETYPE,
+        BASICINFO_CAR_OWNERS,
+        BASICINFO_CARPHONE,
+        BASICINFO_INITIAL_REGISTRATION_DATE,
+        BASICINFO_PROVINCE,
+        BASICINFO_CITY,
+        BASICINFO_COUNTY,
+        CAR_OWNERS,
+        TELEPHONE,
+        REGISTRANT,
+        NETWORK_ACCESS_COMPANY,
+        PROCESSING_DATE,
+        DUE_DATE,
+        ACTUAL_COLLECTION,
+        ALL_FEES,
+        REMINDER_DAYS,
+        REMINDER_DATE,
+        REMINDER_STATUS,
+        BEIDOUINFO,
+        NOTES,
+        ISDELETE,
+        CREATOR,
+        CREATORNAME,
+        CREATTIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME,
+        DELETEOR,
+        DELETEORNAME,
+        DELETTIME
+    </sql>
 
-    <!-- 字段值 -->
+    <!-- 字段值定义 -->
     <sql id="FieldValue">
-#{BEIDOU_ID},
-#{CORPINFO_ID},
-#{NUM},
-#{VEHICLE},
-#{CAR_OWNERS},
-#{TELEPHONE},
-#{REGISTRANT},
-#{NETWORK_ACCESS_COMPANY},
-#{PROCESSING_DATE},
-#{DUE_DATE},
-#{ACTUAL_COLLECTION},
-#{ALL_FEES},
-#{REMINDER_DAYS},
-#{REMINDER_DATE},
-#{REMINDER_STATUS},
-#{BEIDOUINFO},
-#{NOTES},
-#{ARCHIVES_TYPE},
-#{ISDELETE},
-#{CREATOR},
-#{CREATORNAME},
-#{CREATTIME}
-	</sql>
+        #{BEIDOU_ID},
+        #{CORPINFO_ID},
+        #{INDUSTRY_TYPE},
+        #{INDUSTRY_TYPE_TREE},
+        #{INDUSTRY_TYPE_NAMES},
+        #{OPER_CORP},
+        #{VEHICLE},
+        #{BASICINFO_LICENSE_PLATE},
+        #{BASICINFO_VIN},
+        #{BASICINFO_VEHICLETYPE},
+        #{BASICINFO_CAR_OWNERS},
+        #{BASICINFO_CARPHONE},
+        #{BASICINFO_INITIAL_REGISTRATION_DATE},
+        #{BASICINFO_PROVINCE},
+        #{BASICINFO_CITY},
+        #{BASICINFO_COUNTY},
+        #{CAR_OWNERS},
+        #{TELEPHONE},
+        #{REGISTRANT},
+        #{NETWORK_ACCESS_COMPANY},
+        #{PROCESSING_DATE},
+        #{DUE_DATE},
+        #{ACTUAL_COLLECTION},
+        #{ALL_FEES},
+        #{REMINDER_DAYS},
+        #{REMINDER_DATE},
+        #{REMINDER_STATUS},
+        #{BEIDOUINFO},
+        #{NOTES},
+        #{ISDELETE},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATTIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME},
+        #{DELETEOR},
+        #{DELETEORNAME},
+        #{DELETTIME}
+    </sql>
+
 
     <!-- 新增-->
     <insert id="save" parameterType="pd">
diff --git a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml
index f7e833e..0b1f659 100644
--- a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml
+++ b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml
@@ -10,59 +10,93 @@
 
     <!-- 字段 -->
     <sql id="Field">
-MAINTENANCE_ID,
-CORPINFO_ID,
-NUM,
-VEHICLE,
-CAR_OWNERS,
-TELEPHONE,
-REGISTRANT,
-MAINTENANCE_LEVEL,
-MAINTENANCE_CYCLE,
-KILOMETERS,
-PROCESSING_DATE,
-DUE_DATE,
-AGREEMENT_NUM,
-MAINTENANCE_COMPANY,
-REMINDER_DAYS,
-REMINDER_DATE,
-REMINDER_STATUS,
-MAINTENANCEINFO,
-NOTES,
-ARCHIVES_TYPE,
-ISDELETE,
-CREATOR,
-CREATORNAME,
-CREATTIME
-	</sql>
+        MAINTENANCE_ID,
+        CORPINFO_ID,
+        INDUSTRY_TYPE,
+        INDUSTRY_TYPE_TREE,
+        INDUSTRY_TYPE_NAMES,
+        OPER_CORP,
+        VEHICLE,
+        BASICINFO_LICENSE_PLATE,
+        BASICINFO_VIN,
+        BASICINFO_VEHICLETYPE,
+        BASICINFO_CAR_OWNERS,
+        BASICINFO_CARPHONE,
+        BASICINFO_INITIAL_REGISTRATION_DATE,
+        BASICINFO_PROVINCE,
+        BASICINFO_CITY,
+        BASICINFO_COUNTY,
+        CAR_OWNERS,
+        TELEPHONE,
+        REGISTRANT,
+        MAINTENANCE_LEVEL,
+        MAINTENANCE_CYCLE,
+        KILOMETERS,
+        PROCESSING_DATE,
+        DUE_DATE,
+        AGREEMENT_NUM,
+        MAINTENANCE_COMPANY,
+        REMINDER_DAYS,
+        REMINDER_DATE,
+        REMINDER_STATUS,
+        MAINTENANCEINFO,
+        NOTES,
+        ISDELETE,
+        CREATOR,
+        CREATORNAME,
+        CREATTIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME,
+        DELETEOR,
+        DELETEORNAME,
+        DELETTIME
+    </sql>
 
-    <!-- 字段值 -->
+    <!-- 字段值定义 -->
     <sql id="FieldValue">
-#{MAINTENANCE_ID},
-#{CORPINFO_ID},
-#{NUM},
-#{VEHICLE},
-#{CAR_OWNERS},
-#{TELEPHONE},
-#{REGISTRANT},
-#{MAINTENANCE_LEVEL},
-#{MAINTENANCE_CYCLE},
-#{KILOMETERS},
-#{PROCESSING_DATE},
-#{DUE_DATE},
-#{AGREEMENT_NUM},
-#{MAINTENANCE_COMPANY},
-#{REMINDER_DAYS},
-#{REMINDER_DATE},
-#{REMINDER_STATUS},
-#{MAINTENANCEINFO},
-#{NOTES},
-#{ARCHIVES_TYPE},
-#{ISDELETE},
-#{CREATOR},
-#{CREATORNAME},
-#{CREATTIME}
-	</sql>
+        #{MAINTENANCE_ID},
+        #{CORPINFO_ID},
+        #{INDUSTRY_TYPE},
+        #{INDUSTRY_TYPE_TREE},
+        #{INDUSTRY_TYPE_NAMES},
+        #{OPER_CORP},
+        #{VEHICLE},
+        #{BASICINFO_LICENSE_PLATE},
+        #{BASICINFO_VIN},
+        #{BASICINFO_VEHICLETYPE},
+        #{BASICINFO_CAR_OWNERS},
+        #{BASICINFO_CARPHONE},
+        #{BASICINFO_INITIAL_REGISTRATION_DATE},
+        #{BASICINFO_PROVINCE},
+        #{BASICINFO_CITY},
+        #{BASICINFO_COUNTY},
+        #{CAR_OWNERS},
+        #{TELEPHONE},
+        #{REGISTRANT},
+        #{MAINTENANCE_LEVEL},
+        #{MAINTENANCE_CYCLE},
+        #{KILOMETERS},
+        #{PROCESSING_DATE},
+        #{DUE_DATE},
+        #{AGREEMENT_NUM},
+        #{MAINTENANCE_COMPANY},
+        #{REMINDER_DAYS},
+        #{REMINDER_DATE},
+        #{REMINDER_STATUS},
+        #{MAINTENANCEINFO},
+        #{NOTES},
+        #{ISDELETE},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATTIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME},
+        #{DELETEOR},
+        #{DELETEORNAME},
+        #{DELETTIME}
+    </sql>
 
     <!-- 新增-->
     <insert id="save" parameterType="pd">