Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ADC-uniformity
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
凡昌松
ADC-uniformity
Commits
367dd1d9
Commit
367dd1d9
authored
Dec 14, 2021
by
qk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update:参数对比待解决问题无法导出全部
parent
536448e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
CheckRealVehicleVerificationController.java
...em/controller/CheckRealVehicleVerificationController.java
+3
-3
CheckRealVehicleVerification.java
...om/adc/da/system/entity/CheckRealVehicleVerification.java
+2
-2
CheckRealVehicleVerificationDao.xml
...mybatis/mapper/system/CheckRealVehicleVerificationDao.xml
+2
-1
No files found.
adcbs-check/src/main/java/com/adc/da/system/controller/CheckRealVehicleVerificationController.java
View file @
367dd1d9
...
@@ -399,9 +399,9 @@ public class CheckRealVehicleVerificationController {
...
@@ -399,9 +399,9 @@ public class CheckRealVehicleVerificationController {
response
.
setContentType
(
"application/force-download"
);
response
.
setContentType
(
"application/force-download"
);
ExportParams
exportParams
=
new
ExportParams
();
ExportParams
exportParams
=
new
ExportParams
();
exportParams
.
setType
(
ExcelType
.
XSSF
);
exportParams
.
setType
(
ExcelType
.
XSSF
);
if
(
StringUtils
.
isNotBlank
(
id
)){
//
if(StringUtils.isNotBlank(id)){
ids
=
Arrays
.
asList
(
id
.
split
(
","
));
//
ids = Arrays.asList(id.split(","));
}
//
}
if
(
"1"
.
equals
(
checkType
))
{
if
(
"1"
.
equals
(
checkType
))
{
List
<
RVVObdDTO
>
dates
=
checkRealVehicleVerificationService
.
getCheckRealVehicleVer
(
ids
,
checkType
,
List
<
RVVObdDTO
>
dates
=
checkRealVehicleVerificationService
.
getCheckRealVehicleVer
(
ids
,
checkType
,
handleType
,
parameterName
);
handleType
,
parameterName
);
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckRealVehicleVerification.java
View file @
367dd1d9
...
@@ -36,7 +36,7 @@ public class CheckRealVehicleVerification extends BaseReqPageEntity {
...
@@ -36,7 +36,7 @@ public class CheckRealVehicleVerification extends BaseReqPageEntity {
* 包含车型
* 包含车型
*/
*/
@TableField
(
"VEHICLE_TYPE"
)
@TableField
(
"VEHICLE_TYPE"
)
@Excel
(
name
=
"包含车型"
,
width
=
50
)
private
String
vehicleType
;
private
String
vehicleType
;
/**
/**
* 参数配置
* 参数配置
...
@@ -121,7 +121,7 @@ public class CheckRealVehicleVerification extends BaseReqPageEntity {
...
@@ -121,7 +121,7 @@ public class CheckRealVehicleVerification extends BaseReqPageEntity {
@Excel
(
name
=
"备案故障码"
,
width
=
50
)
@Excel
(
name
=
"备案故障码"
,
width
=
50
)
@TableField
(
"RECORD_FAULT_CODE"
)
@TableField
(
"RECORD_FAULT_CODE"
)
private
String
recordFaultCode
;
private
String
recordFaultCode
;
@Excel
(
name
=
"包含车型"
,
width
=
50
)
private
transient
String
parameterType
;
private
transient
String
parameterType
;
/**
/**
...
...
adcbs-check/src/main/resources/mybatis/mapper/system/CheckRealVehicleVerificationDao.xml
View file @
367dd1d9
...
@@ -159,7 +159,8 @@
...
@@ -159,7 +159,8 @@
t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USERNAME,t2.CREATE_TIME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USERNAME,t2.CREATE_TIME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH,t1.PARAM_CONFIG,
t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH,t1.PARAM_CONFIG,
t1.CHECK_END as checkEnd,
t1.CHECK_END as checkEnd,
t1.END_DATE as endDate
t1.END_DATE as endDate,
t2.VEHICLE_TYPE_AND_GROUP
FROM
FROM
NERDS.CHECK_REAL_VEHICLE_VER t1
NERDS.CHECK_REAL_VEHICLE_VER t1
LEFT JOIN
LEFT JOIN
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment