From e92f264edd2a600bc9c63d27aa422304ef713389 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Tue, 15 Oct 2024 17:10:18 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=95=B4=E8=BD=A6=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ocessVehicleDomesticReleaseController.java |  1 +
 ...cessVehicleDomesticReleaseServiceImpl.java |  5 +-
 .../vo/ProcessVehicleDomesticReleaseVo.java   | 49 ++++++++----
 ...VehicleInternationalReleaseController.java |  1 +
 ...ehicleInternationalReleaseServiceImpl.java |  5 +-
 .../ProcessVehicleInternationalReleaseVo.java | 74 ++++++++++++-------
 ...LawsVehicleDomesticLibraryServiceImpl.java |  1 +
 ...ehicleInternationalLibraryServiceImpl.java |  2 +
 8 files changed, 95 insertions(+), 43 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/controller/ProcessVehicleDomesticReleaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/controller/ProcessVehicleDomesticReleaseController.java
index b0af505f..33b38b14 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/controller/ProcessVehicleDomesticReleaseController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/controller/ProcessVehicleDomesticReleaseController.java
@@ -49,6 +49,7 @@ public class ProcessVehicleDomesticReleaseController {
     @AutoLog(value = "国内整车型号和VIN前八位管控流程-导入")
     @ApiOperation(value="国内整车型号和VIN前八位管控流程-导入", notes="国内整车型号和VIN前八位管控流程-导入")
     @PostMapping(value = "/importExcel")
+    @Translation
     public Result<?> excelimport(HttpServletRequest request) {
         return processVehicleDomesticReleaseService.importExcel(request);
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/service/impl/ProcessVehicleDomesticReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/service/impl/ProcessVehicleDomesticReleaseServiceImpl.java
index 99d94bcb..48b5c55d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/service/impl/ProcessVehicleDomesticReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/service/impl/ProcessVehicleDomesticReleaseServiceImpl.java
@@ -181,7 +181,10 @@ public class ProcessVehicleDomesticReleaseServiceImpl extends ServiceImpl<Proces
                 }
             }
         }
-        return Result.OK(excelList.get(0));
+        Object o = excelList.get(0);
+        ProcessVehicleDomesticReleaseVo processVehicleDomesticReleaseVo = new ProcessVehicleDomesticReleaseVo();
+        BeanUtils.copyProperties(o, processVehicleDomesticReleaseVo);
+        return Result.OK(processVehicleDomesticReleaseVo);
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/vo/ProcessVehicleDomesticReleaseVo.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/vo/ProcessVehicleDomesticReleaseVo.java
index 612fdd68..1a9c9c15 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/vo/ProcessVehicleDomesticReleaseVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicledomestic/vo/ProcessVehicleDomesticReleaseVo.java
@@ -68,11 +68,13 @@ public class ProcessVehicleDomesticReleaseVo {
     private String state;
 
     @ApiModelProperty(value = "车型代码")
-    @Excel(name = "车型代码", width = 20)
+    @Excel(name = "车型代码", width = 20, dicCode = "vm_vehicle_type_code")
+    @Dict(dicCode = "vm_vehicle_type_code")
     private String vehicleTypeCode;
 
     @ApiModelProperty(value = "动力类型")
-    @Excel(name = "动力类型", width = 20)
+    @Excel(name = "动力类型", width = 20, dicCode = "vm_power_type")
+    @Dict(dicCode = "vm_power_type")
     private String powerType;
 
     @ApiModelProperty(value = "车辆外廓尺寸(长*宽*高)")
@@ -88,35 +90,43 @@ public class ProcessVehicleDomesticReleaseVo {
     private String vehicleQuality;
 
     @ApiModelProperty(value = "驱动型式")
-    @Excel(name = "驱动型式", width = 20)
+    @Excel(name = "驱动型式", width = 20, dicCode = "vm_driving_type")
+    @Dict(dicCode = "vm_driving_type")
     private String drivingType;
 
     @ApiModelProperty(value = "车身形式")
-    @Excel(name = "车身形式", width = 20)
+    @Excel(name = "车身形式", width = 20, dicCode = "vm_body_type")
+    @Dict(dicCode = "vm_body_type")
     private String bodyType;
 
     @ApiModelProperty(value = "燃料类型")
-    @Excel(name = "燃料类型", width = 20)
+    @Excel(name = "燃料类型", width = 20, dicCode = "vm_fuel_type")
+    @Dict(dicCode = "vm_fuel_type")
     private String fuelType;
 
     @ApiModelProperty(value = "发动机型号")
-    @Excel(name = "发动机型号", width = 20)
+    @Excel(name = "发动机型号", width = 20, dicCode = "vm_engine_type")
+    @Dict(dicCode = "vm_engine_type")
     private String engineType;
 
     @ApiModelProperty(value = "变速器型式")
-    @Excel(name = "变速器型式", width = 20)
+    @Excel(name = "变速器型式", width = 20, dicCode = "vm_transmission_type")
+    @Dict(dicCode = "vm_transmission_type")
     private String transmissionType;
 
     @ApiModelProperty(value = "变速器型号")
-    @Excel(name = "变速器型号", width = 20)
+    @Excel(name = "变速器型号", width = 20, dicCode = "dvm_transmission_model")
+    @Dict(dicCode = "dvm_transmission_model")
     private String transmissionModel;
 
     @ApiModelProperty(value = "发动机排量(L)")
-    @Excel(name = "发动机排量(L)", width = 20)
+    @Excel(name = "发动机排量(L)", width = 20, dicCode = "vm_engine_capacity")
+    @Dict(dicCode = "vm_engine_capacity")
     private String engineCapacity;
 
     @ApiModelProperty(value = "驱动电机型号")
-    @Excel(name = "驱动电机型号", width = 20)
+    @Excel(name = "驱动电机型号", width = 20, dicCode = "vm_driveMotor_model")
+    @Dict(dicCode = "vm_driveMotor_model")
     private String driveMotorModel;
 
     @ApiModelProperty(value = "驱动电机峰值功率(kw)")
@@ -128,15 +138,18 @@ public class ProcessVehicleDomesticReleaseVo {
     private String driveMotorRatedPower;
 
     @ApiModelProperty(value = "驱动电机类型")
-    @Excel(name = "驱动电机类型", width = 20)
+    @Excel(name = "驱动电机类型", width = 20, dicCode = "dvm_drive_motor_type")
+    @Dict(dicCode = "dvm_drive_motor_type")
     private String driveMotorType;
 
     @ApiModelProperty(value = "动力电池型号")
-    @Excel(name = "动力电池型号", width = 20)
+    @Excel(name = "动力电池型号", width = 20, dicCode = "vm_power_battery_model")
+    @Dict(dicCode = "vm_power_battery_model")
     private String powerBatteryModel;
 
     @ApiModelProperty(value = "电池类型")
-    @Excel(name = "电池类型", width = 20)
+    @Excel(name = "电池类型", width = 20, dicCode = "vm_battery_type")
+    @Dict(dicCode = "vm_battery_type")
     private String batteryType;
 
     @ApiModelProperty(value = "混合方式")
@@ -158,19 +171,23 @@ public class ProcessVehicleDomesticReleaseVo {
     private String driveMotorPlace;
 
     @ApiModelProperty(value = "排放水平")
-    @Excel(name = "排放水平", width = 20)
+    @Excel(name = "排放水平", width = 20, dicCode = "dvm_emission_level")
+    @Dict(dicCode = "dvm_emission_level")
     private String emissionLevel;
 
     @ApiModelProperty(value = "油耗阶段")
     @Excel(name = "油耗阶段", width = 20)
+    @Dict(dicCode = "id", dictTable = "laws_domestic_standard", dicText = "standard_number")
     private String fuelConsumptionStage;
 
     @ApiModelProperty(value = "前排正面气囊")
-    @Excel(name = "前排正面气囊", width = 20)
+    @Dict(dicCode = "vm_front_front_airbag")
+    @Excel(name = "前排正面气囊", width = 20, dicCode = "vm_front_front_airbag")
     private String frontFrontAirbag;
 
     @ApiModelProperty(value = "前排座椅侧气囊")
-    @Excel(name = "前排座椅侧气囊", width = 20)
+    @Excel(name = "前排座椅侧气囊", width = 20, dicCode = "vm_front_seat_side_airbags")
+    @Dict(dicCode = "vm_front_seat_side_airbags")
     private String frontSeatSideAirbags;
 
     @ApiModelProperty(value = "备注")
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/controller/ProcessVehicleInternationalReleaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/controller/ProcessVehicleInternationalReleaseController.java
index d4878801..c1698a78 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/controller/ProcessVehicleInternationalReleaseController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/controller/ProcessVehicleInternationalReleaseController.java
@@ -49,6 +49,7 @@ public class ProcessVehicleInternationalReleaseController {
     @AutoLog(value = "国际整车型号和VIN前八位管控流程-导入")
     @ApiOperation(value="国际整车型号和VIN前八位管控流程-导入", notes="国际整车型号和VIN前八位管控流程-导入")
     @PostMapping(value = "/importExcel")
+    @Translation
     public Result<?> excelimport(HttpServletRequest request) {
         return processVehicleInternationalReleaseService.importExcel(request);
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/service/impl/ProcessVehicleInternationalReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/service/impl/ProcessVehicleInternationalReleaseServiceImpl.java
index fb12753b..b79e3fee 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/service/impl/ProcessVehicleInternationalReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/service/impl/ProcessVehicleInternationalReleaseServiceImpl.java
@@ -149,7 +149,10 @@ public class ProcessVehicleInternationalReleaseServiceImpl extends ServiceImpl<P
                 }
             }
         }
-        return Result.OK(excelList.get(0));
+        ProcessVehicleInternationalExcelVo processVehicleInternationalExcelVo = excelList.get(0);
+        ProcessVehicleInternationalReleaseVo processVehicleInternationalReleaseVo = new ProcessVehicleInternationalReleaseVo();
+        BeanUtils.copyProperties(processVehicleInternationalExcelVo, processVehicleInternationalReleaseVo);
+        return Result.OK(processVehicleInternationalReleaseVo);
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/vo/ProcessVehicleInternationalReleaseVo.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/vo/ProcessVehicleInternationalReleaseVo.java
index 3f41a8eb..cf5d28ba 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/vo/ProcessVehicleInternationalReleaseVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/vehicleinterntional/vo/ProcessVehicleInternationalReleaseVo.java
@@ -25,7 +25,8 @@ public class ProcessVehicleInternationalReleaseVo {
     private String vehicleModel;
 
     @ApiModelProperty(value = "车辆型式")
-    @Excel(name = "车辆型式", width = 20)
+    @Excel(name = "车辆型式", width = 20, dicCode = "ivm_vehicle_type")
+    @Dict(dicCode = "ivm_vehicle_type")
     private String vehicleType;
 
     @ApiModelProperty(value = "变型(variant)")
@@ -74,47 +75,58 @@ public class ProcessVehicleInternationalReleaseVo {
     private String state;
 
     @ApiModelProperty(value = "车型代码")
-    @Excel(name = "车型代码", width = 20)
+    @Excel(name = "车型代码", width = 20, dicCode = "vm_vehicle_type_code")
+    @Dict(dicCode = "vm_vehicle_type_code")
     private String vehicleTypeCode;
 
     @ApiModelProperty(value = "动力类型")
-    @Excel(name = "动力类型", width = 20)
+    @Excel(name = "动力类型", width = 20, dicCode = "vm_power_type")
+    @Dict(dicCode = "vm_power_type")
     private String powerType;
 
     @ApiModelProperty(value = "发动机型号")
-    @Excel(name = "发动机型号", width = 20)
+    @Excel(name = "发动机型号", width = 20, dicCode = "vm_engine_type")
+    @Dict(dicCode = "vm_engine_type")
     private String engineType;
 
     @ApiModelProperty(value = "驱动电机型号")
-    @Excel(name = "驱动电机型号", width = 20)
+    @Excel(name = "驱动电机型号", width = 20, dicCode = "vm_driveMotor_model")
+    @Dict(dicCode = "vm_driveMotor_model")
     private String driveMotorModel;
 
     @ApiModelProperty(value = "动力电池型号")
-    @Excel(name = "动力电池型号", width = 20)
+    @Excel(name = "动力电池型号", width = 20, dicCode = "vm_power_battery_model")
+    @Dict(dicCode = "vm_power_battery_model")
     private String powerBatteryModel;
 
     @ApiModelProperty(value = "变速器型号")
-    @Excel(name = "变速器型号", width = 20)
+    @Excel(name = "变速器型号", width = 20, dicCode = "ivm_transmission_model")
+    @Dict(dicCode = "ivm_transmission_model")
     private String transmissionModel;
 
     @ApiModelProperty(value = "车身形式")
-    @Excel(name = "车身形式", width = 20)
+    @Excel(name = "车身形式", width = 20, dicCode = "vm_body_type")
+    @Dict(dicCode = "vm_body_type")
     private String bodyType;
 
-    @ApiModelProperty(value = "驱动型式")
-    @Excel(name = "驱动型式", width = 20)
+    @ApiModelProperty(value = "驱动形式")
+    @Excel(name = "驱动形式", width = 20, dicCode = "vm_driving_type")
+    @Dict(dicCode = "vm_driving_type")
     private String drivingType;
 
     @ApiModelProperty(value = "驱动轴数量")
-    @Excel(name = "驱动轴数量", width = 20)
+    @Excel(name = "驱动轴数量", width = 20, dicCode = "ivm_driving_shafts_number")
+    @Dict(dicCode = "ivm_driving_shafts_number")
     private String drivingShaftsNumber;
 
     @ApiModelProperty(value = "转向型式")
-    @Excel(name = "转向型式", width = 20)
+    @Excel(name = "转向型式", width = 20, dicCode = "ivm_steering_type")
+    @Dict(dicCode = "ivm_steering_type")
     private String steeringType;
 
     @ApiModelProperty(value = "座位数量")
-    @Excel(name = "座位数量", width = 20)
+    @Excel(name = "座位数量", width = 20, dicCode = "ivm_seats_number")
+    @Dict(dicCode = "ivm_seats_number")
     private String seatsNumber;
 
     @ApiModelProperty(value = "技术允许最大满载质量(Kg)")
@@ -126,15 +138,18 @@ public class ProcessVehicleInternationalReleaseVo {
     private String carOutSize;
 
     @ApiModelProperty(value = "发动机工作原理")
-    @Excel(name = "发动机工作原理", width = 20)
+    @Excel(name = "发动机工作原理", width = 20, dicCode = "ivm_engine_working_principle")
+    @Dict(dicCode = "ivm_engine_working_principle")
     private String engineWorkingPrinciple;
 
     @ApiModelProperty(value = "燃料类型")
-    @Excel(name = "燃料类型", width = 20)
+    @Excel(name = "燃料类型", width = 20, dicCode = "vm_fuel_type")
+    @Dict(dicCode = "vm_fuel_type")
     private String fuelType;
 
     @ApiModelProperty(value = "发动机排量(L)")
-    @Excel(name = "发动机排量(L)", width = 20)
+    @Excel(name = "发动机排量(L)", width = 20, dicCode = "vm_engine_capacity")
+    @Dict(dicCode = "vm_engine_capacity")
     private String engineCapacity;
 
     @ApiModelProperty(value = "额定转速(rpm)")
@@ -150,7 +165,8 @@ public class ProcessVehicleInternationalReleaseVo {
     private String driveMotorPeakPower;
 
     @ApiModelProperty(value = "排放水平")
-    @Excel(name = "排放水平", width = 20)
+    @Excel(name = "排放水平", width = 20, dicCode = "dvm_emission_level")
+    @Dict(dicCode = "dvm_emission_level")
     private String emissionLevel;
 
     @ApiModelProperty(value = "能耗(L/100km or kwh/100km)")
@@ -158,35 +174,43 @@ public class ProcessVehicleInternationalReleaseVo {
     private String energyConsumption;
 
     @ApiModelProperty(value = "储能装置种类")
-    @Excel(name = "储能装置种类", width = 20)
+    @Excel(name = "储能装置种类", width = 20, dicCode = "vm_battery_type")
+    @Dict(dicCode = "vm_battery_type")
     private String energyStorageDevices;
 
     @ApiModelProperty(value = "变速器型式")
-    @Excel(name = "变速器型式", width = 20)
+    @Excel(name = "变速器型式", width = 20, dicCode = "vm_transmission_type")
+    @Dict(dicCode = "vm_transmission_type")
     private String transmissionType;
 
     @ApiModelProperty(value = "变速器档位数")
-    @Excel(name = "变速器档位数", width = 20)
+    @Excel(name = "变速器档位数", width = 20, dicCode = "ivm_transmission_gear_number")
+    @Dict(dicCode = "ivm_transmission_gear_number")
     private String transmissionGearNumber;
 
     @ApiModelProperty(value = "变速器是否带手动模式")
-    @Excel(name = "变速器是否带手动模式", width = 20)
+    @Excel(name = "变速器是否带手动模式", width = 20, dicCode = "yn")
+    @Dict(dicCode = "yn")
     private String transmissionIsHasManual;
 
     @ApiModelProperty(value = "前排正面气囊")
-    @Excel(name = "前排正面气囊", width = 20)
+    @Excel(name = "前排正面气囊", width = 20, dicCode = "vm_front_front_airbag")
+    @Dict(dicCode = "vm_front_front_airbag")
     private String frontFrontAirbag;
 
     @ApiModelProperty(value = "前排座椅侧气囊")
-    @Excel(name = "前排座椅侧气囊", width = 20)
+    @Excel(name = "前排座椅侧气囊", width = 20, dicCode = "vm_front_seat_side_airbags")
+    @Dict(dicCode = "vm_front_seat_side_airbags")
     private String frontSeatSideAirbags;
 
     @ApiModelProperty(value = "销售区域")
-    @Excel(name = "销售区域", width = 20)
+    @Excel(name = "销售区域", width = 20, dicCode = "ivm_sales_area")
+    @Dict(dicCode = "ivm_sales_area")
     private String salesArea;
 
     @ApiModelProperty(value = "品牌")
-    @Excel(name = "品牌", width = 20)
+    @Excel(name = "品牌", width = 20, dicCode = "ivm_brand")
+    @Dict(dicCode = "ivm_brand")
     private String brand;
 
     @ApiModelProperty(value = "备注")
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleDomesticLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleDomesticLibraryServiceImpl.java
index 4457eefd..3cd4cd48 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleDomesticLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleDomesticLibraryServiceImpl.java
@@ -199,6 +199,7 @@ public class LawsVehicleDomesticLibraryServiceImpl extends ServiceImpl<LawsVehic
             }
         }
         lambdaQueryWrapper.eq(LawsVehicleDomesticLibrary::getIsFinish, Constant.IS_FINISH); // 只展示走完流程的数据
+        lambdaQueryWrapper.orderByDesc(LawsVehicleDomesticLibrary::getCreateTime);
         return lambdaQueryWrapper;
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleInternationalLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleInternationalLibraryServiceImpl.java
index 9adcfec3..6b7b4d54 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleInternationalLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsVehicleInternationalLibraryServiceImpl.java
@@ -14,6 +14,7 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.activiti.process.vehicleinterntional.entity.ProcessVehicleInternationalRelease;
 import com.jero.modules.activiti.process.vehicleinterntional.vo.ProcessVehicleInternationalReleaseVo;
 import com.jero.modules.laws.businessSupport.common.Constant;
+import com.jero.modules.laws.businessSupport.entity.LawsVehicleDomesticLibrary;
 import com.jero.modules.laws.businessSupport.entity.LawsVehicleInternationalLibrary;
 import com.jero.modules.laws.businessSupport.entity.LawsVehicleInternationalLibrarySublist;
 import com.jero.modules.laws.businessSupport.mapper.LawsVehicleInternationalLibraryMapper;
@@ -203,6 +204,7 @@ public class LawsVehicleInternationalLibraryServiceImpl extends ServiceImpl<Laws
             }
         }
         lambdaQueryWrapper.eq(LawsVehicleInternationalLibrary::getIsFinish, Constant.IS_FINISH); // 只展示走完流程的数据
+        lambdaQueryWrapper.orderByDesc(LawsVehicleInternationalLibrary::getCreateTime);
         return lambdaQueryWrapper;
     }
 }