众测资源工具

site/src/main/java/com/mooctest/crowd/site/data/vo/ResourceVO.java

@@ -28,7 +28,7 @@ public class ResourceVO implements Serializable {
     private String unitWork;
     private String standard;
     private String unit;
-    private int state;
+    private String state;
     private Timestamp startTime;
     private String personnel;
     private String remarks;
@@ -45,7 +45,6 @@ public class ResourceVO implements Serializable {
         unitWork=resource.getUnitWork();
         standard=resource.getStandard();
         unit=resource.getUnit();
-        state=resource.getState();
         startTime=resource.getStartTime();
         personnel=resource.getPersonnel();
         remarks=resource.getRemarks();

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1273,20 +1273,15 @@ public class WebMediatorImpl implements ViewMediator {
             resourceVO.setUnitWork(resourcePO.getUnitWork());
             resourceVO.setStandard(resourcePO.getStandard());
             resourceVO.setUnit(resourcePO.getUnit());
-            resourceVO.setState(resourcePO.getState());
             StatusVO statusVO = new StatusVO();
             if(resourcePO.getState()==0){
-                statusVO.setText("空闲");
-                resourceVO.setStatusVO(statusVO);
+                resourceVO.setState("空闲");
             }else if(resourcePO.getState()==1){
-                statusVO.setText("占用");
-                resourceVO.setStatusVO(statusVO);
+                resourceVO.setState("占用");
             }else if(resourcePO.getState()==2){
-                statusVO.setText("可用");
-                resourceVO.setStatusVO(statusVO);
+                resourceVO.setState("可用");
             }else if(resourcePO.getState()==3){
-                statusVO.setText("故障");
-                resourceVO.setStatusVO(statusVO);
+                resourceVO.setState("故障");
             }
             resourceVO.setStartTime(resourcePO.getStartTime());
             resourceVO.setPersonnel(resourcePO.getPersonnel());
@@ -1312,20 +1307,15 @@ public class WebMediatorImpl implements ViewMediator {
         resourceVO.setUnitWork(resourcePO.get().getUnitWork());
         resourceVO.setStandard(resourcePO.get().getStandard());
         resourceVO.setUnit(resourcePO.get().getUnit());
-        resourceVO.setState(resourcePO.get().getState());
         StatusVO statusVO = new StatusVO();
         if(resourcePO.get().getState()==0){
-            statusVO.setText("空闲");
-            resourceVO.setStatusVO(statusVO);
+            resourceVO.setState("空闲");
         }else if(resourcePO.get().getState()==1){
-            statusVO.setText("占用");
-            resourceVO.setStatusVO(statusVO);
+            resourceVO.setState("占用");
         }else if(resourcePO.get().getState()==2){
-            statusVO.setText("可用");
-            resourceVO.setStatusVO(statusVO);
+            resourceVO.setState("可用");
         }else if(resourcePO.get().getState()==3){
-            statusVO.setText("故障");
-            resourceVO.setStatusVO(statusVO);
+            resourceVO.setState("故障");
         }
         resourceVO.setStartTime(resourcePO.get().getStartTime());
         resourceVO.setPersonnel(resourcePO.get().getPersonnel());
@@ -1349,7 +1339,16 @@ public class WebMediatorImpl implements ViewMediator {
             resourceVO.setUnitWork(resourcePO.getUnitWork());
             resourceVO.setStandard(resourcePO.getStandard());
             resourceVO.setUnit(resourcePO.getUnit());
-            resourceVO.setState(resourcePO.getState());
+            StatusVO statusVO = new StatusVO();
+            if(resourcePO.getState()==0){
+                resourceVO.setState("空闲");
+            }else if(resourcePO.getState()==1){
+                resourceVO.setState("占用");
+            }else if(resourcePO.getState()==2){
+                resourceVO.setState("可用");
+            }else if(resourcePO.getState()==3){
+                resourceVO.setState("故障");
+            }
             resourceVO.setStartTime(resourcePO.getStartTime());
             resourceVO.setPersonnel(resourcePO.getPersonnel());
             resourceVO.setRemarks(resourcePO.getRemarks());