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 @@
-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
-
+ 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
+
-
+
-#{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}
-
+ #{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}
+
+
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 @@
-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
-
+ 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
+
-
+
-#{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}
-
+ #{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}
+