From 05e0420320c258ea01f6bf1993d5f2d2d2066f71 Mon Sep 17 00:00:00 2001
From: renchao <753504961@qq.com>
Date: Mon, 24 May 2021 15:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/enumation/ProjectEnum.java       | 29 +++++++++++++++----
 .../impl/TProcessesDrillingServiceImpl.java   |  2 +-
 .../service/impl/TSysDictServiceImpl.java     |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
index 9eb9be1..56f1605 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
@@ -316,19 +316,21 @@ public class ProjectEnum {
      */
     public enum TSysDict {
 
-        ID(0, "ID","ID"),
+        ID(0, "ID",0,"ID"),
 
-        SIX(6, "6","id为6的数据");
+        TAG_DATE(1, "6",6,"id为6的数据");
 
         // 成员变量
         private int value;
         private String label;
+        private int id;
         private String explain;
 
         // 构造方法
-        TSysDict(int value, String label, String explain) {
+        TSysDict(int value, String label, int id,String explain) {
             this.value = value;
             this.label = label;
+            this.id = id;
             this.explain = explain;
         }
 
@@ -341,7 +343,7 @@ public class ProjectEnum {
                     return c.label;
                 }
             }
-            return TSysDict.SIX.label;
+            return TSysDict.ID.label;
         }
 
         /**
@@ -353,13 +355,30 @@ public class ProjectEnum {
                     return c.value;
                 }
             }
-            return TSysDict.SIX.value;
+            return TSysDict.ID.value;
+        }
+
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getId(String label) {
+            for (TSysDict c : TSysDict.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.id;
+                }
+            }
+            return TSysDict.ID.id;
         }
 
         public int getValue() {
             return value;
         }
 
+        public int getId() {
+            return id;
+        }
+
         public String getLabel() {
             return label;
         }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
index 4d5c710..fd93ddd 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
@@ -98,7 +98,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         //例如查询出来name字段是26：上月26日到当前日期的实测孔深相加
         //查询字典id为6的name字段
         TSysDictQuery tSysDictQuery = new TSysDictQuery();
-        tSysDictQuery.setId(ProjectEnum.TSysDict.SIX.getValue());
+        tSysDictQuery.setId(ProjectEnum.TSysDict.TAG_DATE.getId());
         R<String> name = itSysDictService.getNameByQuery(tSysDictQuery);
         if (name.getCode() != 0) {
             log.error("穿孔工序中->获取字典SysDict的id为6数据的name字段失败");
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java
index ed9573a..7a0766b 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java
@@ -41,7 +41,7 @@ public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> i
         //获取标注日期，将字典中id为6的数据的name字段做比较
         //大于name字段记录下一个月，小于该字段记录本月
         //获取id为6的字典
-        TSysDict tSysDict = baseMapper.selectById(ProjectEnum.TSysDict.SIX.getValue());
+        TSysDict tSysDict = baseMapper.selectById(ProjectEnum.TSysDict.TAG_DATE.getId());
         if (tSysDict == null || StringUtils.isBlank(tSysDict.getName())) {
             return R.failed("数据字典中->不存在id为6的数据");
         }
-- 
2.18.1