Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/CheckStatusEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum CheckStatusEnum {
+	QUALIFIED("合格","1",""),
+	UNQUALIFIED("不合格","2","#DF7400"),
+	OMISSION("漏检", "3","#FF0000");
+	
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+	/**
+	 * 编码
+	 */
+	private String code;
+	
+	/**
+	 * 颜色
+	 */
+	private String color;
+
+
+	private CheckStatusEnum(String name, String code, String color){
+		this.name = name;
+		this.code = code;
+		this.color = color;
+	}
+	
+	public static CheckStatusEnum getEnum(String code) {
+		CheckStatusEnum checkStatusEnum = null;
+		for(CheckStatusEnum type: CheckStatusEnum.values()) {
+			if (type.getCode().equals(code)) {
+				checkStatusEnum = type;
+				break;
+			}
+		}
+		
+		return checkStatusEnum;
+	}
+	
+	public static List<Map<String,String>> getEnumList() {
+		List<Map<String,String>> nameList = new ArrayList<>();
+		for (CheckStatusEnum c: CheckStatusEnum.values()) {
+			Map<String, String> map = new HashMap<String, String>();
+			map.put("name", c.getName());
+			map.put("code", c.getCode());
+			map.put("color", c.getColor());
+			nameList.add(map);
+		}
+		return nameList;
+	}
+
+	public static String getNameByCode(String code) {
+		for (CheckStatusEnum status: CheckStatusEnum.values()) {
+			if (status.getCode().equals(code)) {
+				return status.getName();
+			}
+		}
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+	
+
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -1864,14 +1864,15 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
                 MileageDto mileageDto = new MileageDto();
                 Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, list.get(i).getIotCode());
                 mileageDto.setCarNum(list.get(i).getCarNum());
-                mileageDto.setCarCode(list.get(i).getCode());
+                mileageDto.setCarCode(list.get(i).getRemark());
                 mileageDto.setIotCode(date + "::" + list.get(i).getIotCode());
-                mileageDto.setTotal(carMaxTravel+"KM");
                 if (totalTravel != null) {
                     mileageDto.setTotalTravel((totalTravel / carMaxTravel) * 100);
                 } else {
-                    mileageDto.setTotalTravel(0.0);
+                    totalTravel= 0.0;
+                    mileageDto.setTotalTravel(totalTravel);
                 }
+                mileageDto.setTotal(totalTravel+"KM");
                 mileageDtoList.add(mileageDto);
             }
         }