优化项目资源代码

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProjectResourceEnum.java

@@ -8,37 +8,37 @@ public enum ProjectResourceEnum {
     设备资源("设备","equipment"),
     管材资源("管材","material");
 
-    private String status;
+    private String name;
 
 
 
-    public String getStatus() {
-        return status;
+    public String getName() {
+        return name;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getState() {
-        return state;
+    public String getCode() {
+        return code;
     }
 
-    public void setState(String state) {
-        this.state = state;
+    public void setCode(String code) {
+        this.code = code;
     }
 
-    ProjectResourceEnum(String status, String state) {
-        this.status = status;
-        this.state = state;
+    ProjectResourceEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
     }
 
-    private String state;
+    private String code;
 
     public static final Map<String,String> map=new HashMap<>();
     static {
         for (ProjectResourceEnum projectResourceEnum:ProjectResourceEnum.values()){
-            map.put(projectResourceEnum.status, projectResourceEnum.state);
+            map.put(projectResourceEnum.name, projectResourceEnum.code);
         }
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectResourceServiceImpl.java

@@ -20,7 +20,6 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 
 import java.util.List;
@@ -129,14 +128,14 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
             Long SequenceNbr = Long.valueOf(jsonObject.getString("sequenceNbr"));
             String type = jsonObject.getString("type");
             //判断资源类型并插入
-            if (type.equals(设备资源.getStatus())) {
-                projectResource.setType(设备资源.getState());
+            if (type.equals(设备资源.getName())) {
+                projectResource.setType(设备资源.getCode());
             }
-            if (type.equals(焊工资源.getStatus())) {
-                projectResource.setType(焊工资源.getState());
+            if (type.equals(焊工资源.getName())) {
+                projectResource.setType(焊工资源.getCode());
             }
-            if (type.equals(管材资源.getStatus())) {
-                projectResource.setType(管材资源.getState());
+            if (type.equals(管材资源.getName())) {
+                projectResource.setType(管材资源.getCode());
             }
 
             projectResource.setProjectId(SequenceNbr);