Commit 367dd1d9 authored by qk's avatar qk

Update:参数对比待解决问题无法导出全部

parent 536448e1
...@@ -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);
......
...@@ -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;
/** /**
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment