From e498e084b2ccc08afc7a7bf3a83e6eb462c1629b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 九月 2024 11:29:26 +0800
Subject: [PATCH] 工单取图片优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 106 insertions(+), 4 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
index 0f87d90..cc7673d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
@@ -2,41 +2,47 @@
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
/**
- * 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉锛�2.3.0鐗堟湰鏂板
+ * 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉锛氳溅杈嗭紙杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬с�侊級
*
* @author gonghl
*/
@Data
-@Document(collection = "vehicle_device_inspection")
+@Document(collection = "hk_vehicle_device_inspection")
public class VehicleDeviceInspectionResult extends BaseResult {
/**
* 璁惧缂栧彿锛宒ataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
*/
+ @TextIndexed
private String externalIndexCode;
/**
* 璁惧鍚嶇О
*/
+ @TextIndexed
private String deviceName;
/**
* 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮�
*/
+ @TextIndexed
private String indexCode;
/**
* 缁勭粐缂栧彿
*/
+ @TextIndexed
private String orgCode;
/**
* 缁勭粐鍚嶇О
*/
+ @TextIndexed
private String orgName;
/**
@@ -63,6 +69,11 @@
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滐紝1:姝ｅ父 2:鏃犳暟鎹� 4:鏁版嵁閲忓皯
*/
private Integer snapResult;
+
+ /**
+ * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滐紝1:姝ｅ父 2:鏃犳暟鎹� 4:鏁版嵁閲忓皯
+ */
+ private String snapResultText;
// 浠ヤ笅涓哄祵濂楀璞＄殑瀛楁
@@ -91,12 +102,25 @@
*/
private Integrity integrity;
+ public String getSnapResultText() {
+ if (snapResult == 1) {
+ snapResultText = "姝ｅ父";
+ }
+ if (snapResult == 2) {
+ snapResultText = "鏃犳暟鎹�";
+ }
+ if (snapResult == 4) {
+ snapResultText = "鏁版嵁閲忓皯";
+ }
+ return snapResultText;
+ }
+
// 鍐呭祵瀵硅薄瀹氫箟
@Data
public static class SnapClock {
/**
- * 鏃堕挓鍑嗙‘鐜�
+ * 鏃堕挓鍑嗙‘鐜囷細1 == 100%
*/
private Float clockPercent;
@@ -111,6 +135,11 @@
private Integer todayClockResult;
/**
+ * 褰撴棩鎺ユ敹鐨勫綋鏃ユ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String todayClockResultText;
+
+ /**
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭暟鎹噺
*/
private Integer allClockCount;
@@ -119,12 +148,37 @@
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
*/
private Integer allClockResult;
+
+ /**
+ * 褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String allClockResultText;
+
+ public String getTodayClockResultText() {
+ if (todayClockResult == 1) {
+ todayClockResultText = "鍚堟牸";
+ }
+ if (todayClockResult == 0) {
+ todayClockResultText = "涓嶅悎鏍�";
+ }
+ return todayClockResultText;
+ }
+
+ public String getAllClockResultText() {
+ if (allClockResult == 1) {
+ allClockResultText = "鍚堟牸";
+ }
+ if (allClockResult == 0) {
+ allClockResultText = "涓嶅悎鏍�";
+ }
+ return allClockResultText;
+ }
}
@Data
public static class SnapTimely {
/**
- * 鍙婃椂鐜�
+ * 鍙婃椂鐜� 1 == 100%
*/
private Float timelyPercent;
@@ -154,6 +208,11 @@
private Integer todayTimelyResult;
/**
+ * 褰撴棩鎺ユ敹鐨勫綋鏃ユ姄鎷嶆暟鎹暟鎹強鏃舵�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String todayTimelyResultText;
+
+ /**
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ暟鎹欢杩熼噺
*/
private Integer allDelayCount;
@@ -177,6 +236,31 @@
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ暟鎹強鏃舵�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
*/
private Integer allTimelyResult;
+
+ /**
+ * 褰撴棩鎺ユ敹鐨勫叏閮ㄦ暟鎹強鏃舵�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String allTimelyResultText;
+
+ public String getTodayTimelyResultText() {
+ if (todayTimelyResult == 1) {
+ todayTimelyResultText = "鍚堟牸";
+ }
+ if (todayTimelyResult == 0) {
+ todayTimelyResultText = "涓嶅悎鏍�";
+ }
+ return todayTimelyResultText;
+ }
+
+ public String getAllTimelyResultText() {
+ if (allTimelyResult == 1) {
+ allTimelyResultText = "鍚堟牸";
+ }
+ if (allTimelyResult == 0) {
+ allTimelyResultText = "涓嶅悎鏍�";
+ }
+ return allTimelyResultText;
+ }
}
@Data
@@ -208,6 +292,24 @@
* 杞︾墝璇嗗埆寮傚父锛氱粨鏋滅被鍨� 1:姝ｅ父 2:璇嗗埆鐜囦綆 3:鏄煎璇嗗埆鐜囩獊鍙�
*/
private Integer recgResult;
+
+ /**
+ * 杞︾墝璇嗗埆寮傚父锛氱粨鏋滅被鍨� 1:姝ｅ父 2:璇嗗埆鐜囦綆 3:鏄煎璇嗗埆鐜囩獊鍙�
+ */
+ private String recgResultText;
+
+ public String getRecgResultText() {
+ if (recgResult == 1) {
+ recgResultText = "姝ｅ父";
+ }
+ if (recgResult == 2) {
+ recgResultText = "璇嗗埆鐜囦綆";
+ }
+ if (recgResult == 3) {
+ recgResultText = "鏄煎璇嗗埆鐜囩獊鍙�";
+ }
+ return recgResultText;
+ }
}
@Data
--
Gitblit v1.8.0