Просмотр исходного кода

添加车辆用途 使用性质

wks 2 лет назад
Родитель
Сommit
cd10062e79

+ 27 - 0
src/main/java/com/ydtech/constants/enums/dict/insurance/BusinessVehicleUse.java

@@ -0,0 +1,27 @@
+package com.ydtech.constants.enums.dict.insurance;
+
+
+import com.ydtech.aop.request.DictEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "businessVehicleUse", desc = "(车辆用途)营业")
+public enum BusinessVehicleUse {
+
+    BVU_01("01", "营业出租租赁", 1, 0),
+    BVU_02("02", "营业城市公交", 1, 0),
+    BVU_03("03", "营业公路客运", 1, 0),
+    BVU_04("04", "营业货运", 1, 0);
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+}

+ 2 - 4
src/main/java/com/ydtech/constants/enums/dict/insurance/NatureOfVehicleUse.java

@@ -16,10 +16,8 @@ import lombok.Getter;
 @DictEnum(key = "natureOfVehicleUse", desc = "车辆使用性质")
 public enum NatureOfVehicleUse implements IBaseEnum {
 
-    NOVU_8A("8A", "家庭自用", 0, 0);
-//    NOVU_8A("8B" , "非营业企业", 0, 0),
-//    NOVU_8A("8C" , "非营业党政机关,事业团体", 0, 0),
-//    NOVU_8A("8D" , "非营业货车", 0, 0);
+    NOVU_01("01", "营业", 0, 0),
+    NOVU_02("02", "非营业", 0, 0);
 
     // 编号
     private final String code;

+ 28 - 0
src/main/java/com/ydtech/constants/enums/dict/insurance/OutOfBusinessVehicleUse.java

@@ -0,0 +1,28 @@
+package com.ydtech.constants.enums.dict.insurance;
+
+
+import com.ydtech.aop.request.DictEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "outOfBusinessVehicleUse", desc = "(车辆用途)非营业")
+public enum OutOfBusinessVehicleUse {
+
+    OBVIOUS_01("05", "家庭自用", 1, 0),
+    OBVIOUS_02("06", "非营业机关", 2, 0),
+    OBVIOUS_03("07", "非营业企业", 3, 0),
+    OBVIOUS_04("08", "非营业货运", 4, 0);
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+
+}

+ 13 - 1
src/main/java/com/ydtech/modules/ins/model/vo/CarInfoVo.java

@@ -125,12 +125,24 @@ public class CarInfoVo {
     /**
      * @see com.ydtech.constants.enums.dict.insurance.NatureOfVehicleUse
      */
-    @ApiModelProperty(value = "使用性质(8A家庭自用8B非营运)")
+    @ApiModelProperty(value = "使用性质")
     private String carnature;
 
+    /**
+     * 营业
+     *
+     * @see com.ydtech.constants.enums.dict.insurance.BusinessVehicleUse
+     * 非营业
+     * @see com.ydtech.constants.enums.dict.insurance.OutOfBusinessVehicleUse
+     */
+    @ApiModelProperty(value = "车辆用途")
+    private String vehicleUse;
+
     @ApiModelProperty(value = "所属性质(1个人 2企业 3机关)")
     private String property;
+
     @ApiModelProperty(value = "发动机功率")
     private String powerScale;
 
+
 }

+ 2 - 2
src/main/java/com/ydtech/modules/order/constants/InsuranceTypeCorrespondence.java

@@ -42,8 +42,8 @@ public class InsuranceTypeCorrespondence {
     protected static final Map<String, String> ZM_CAR_MotorUsageTypeCode = new HashMap<>();
 
     static {
-        ZM_CAR_MotorUsageTypeCode.put("XX", "01");//营业
-        ZM_CAR_MotorUsageTypeCode.put("8A", "02");//非营业
+        ZM_CAR_MotorUsageTypeCode.put("01", "01");//营业
+        ZM_CAR_MotorUsageTypeCode.put("02", "02");//非营业
     }
 
     public static String[] getJinZhangGuiType() {