工单详情反馈信息列表

gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 import com.zehong.system.domain.TDeviceInfo;
+import com.zehong.system.domain.TOrderFeedback;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -42,6 +43,9 @@ public class WorkOrderVo extends BaseEntity
     /** 设备列表 */
     private List<TDeviceInfo> deviceInfoList;
 
+    /** 反馈信息列表 */
+    private List<TOrderFeedback> feedbackList;
+
     /** 设备数量 */
     private int deviceNum;
 
@@ -86,28 +90,12 @@ public class WorkOrderVo extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date actualTime;
 
+    /** 归档信息 */
+    private String archiving;
+
     /** 备注 */
     private String remarks;
 
-    /** 反馈内容 */
-    private String contents;
-
-    /** 反馈时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date feedbackTime;
-
-    /** 图片地址1 */
-    private String pictureUrl1;
-
-    /** 图片地址2 */
-    private String pictureUrl2;
-
-    /** 图片地址3 */
-    private String pictureUrl3;
-
-    /** 处理状态 */
-    private String dealStatus;
-
     public void setOrderId(String orderId)
     {
         this.orderId = orderId;
@@ -169,6 +157,14 @@ public class WorkOrderVo extends BaseEntity
         this.deviceInfoList = deviceInfoList;
     }
 
+    public List<TOrderFeedback> getFeedbackList() {
+        return feedbackList;
+    }
+
+    public void setFeedbackList(List<TOrderFeedback> feedbackList) {
+        this.feedbackList = feedbackList;
+    }
+
     public int getDeviceNum() {
         return deviceNum;
     }
@@ -234,6 +230,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return orderStatus;
     }
+
     public void setAppointInspector(Long appointInspector)
     {
         this.appointInspector = appointInspector;
@@ -243,6 +240,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return appointInspector;
     }
+
     public void setAllotTime(Date allotTime) 
     {
         this.allotTime = allotTime;
@@ -252,6 +250,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return allotTime;
     }
+
     public void setActualInspector(Long actualInspector)
     {
         this.actualInspector = actualInspector;
@@ -261,6 +260,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return actualInspector;
     }
+
     public void setActualTime(Date actualTime) 
     {
         this.actualTime = actualTime;
@@ -270,6 +270,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return actualTime;
     }
+
     public void setRemarks(String remarks) 
     {
         this.remarks = remarks;
@@ -280,6 +281,14 @@ public class WorkOrderVo extends BaseEntity
         return remarks;
     }
 
+    public String getArchiving() {
+        return archiving;
+    }
+
+    public void setArchiving(String archiving) {
+        this.archiving = archiving;
+    }
+
     public String getAppointInspectorName() {
         return appointInspectorName;
     }
@@ -296,54 +305,6 @@ public class WorkOrderVo extends BaseEntity
         this.actualInspectorName = actualInspectorName;
     }
 
-    public String getContents() {
-        return contents;
-    }
-
-    public void setContents(String contents) {
-        this.contents = contents;
-    }
-
-    public Date getFeedbackTime() {
-        return feedbackTime;
-    }
-
-    public void setFeedbackTime(Date feedbackTime) {
-        this.feedbackTime = feedbackTime;
-    }
-
-    public String getPictureUrl1() {
-        return pictureUrl1;
-    }
-
-    public void setPictureUrl1(String pictureUrl1) {
-        this.pictureUrl1 = pictureUrl1;
-    }
-
-    public String getPictureUrl2() {
-        return pictureUrl2;
-    }
-
-    public void setPictureUrl2(String pictureUrl2) {
-        this.pictureUrl2 = pictureUrl2;
-    }
-
-    public String getPictureUrl3() {
-        return pictureUrl3;
-    }
-
-    public void setPictureUrl3(String pictureUrl3) {
-        this.pictureUrl3 = pictureUrl3;
-    }
-
-    public String getDealStatus() {
-        return dealStatus;
-    }
-
-    public void setDealStatus(String dealStatus) {
-        this.dealStatus = dealStatus;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -139,15 +139,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         workOrderVo.setDeviceInfoList(deviceInfoList);
 
         List<TOrderFeedback> feedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(tWorkOrder.getOrderId());
-        if(feedbackList.size() != 0){
-            TOrderFeedback feedback = feedbackList.get(0);
-            workOrderVo.setContents(feedback.getContents());
-            workOrderVo.setFeedbackTime(feedback.getFeedbackTime());
-            workOrderVo.setDealStatus(feedback.getDealStatus());
-            workOrderVo.setPictureUrl1(feedback.getPictureUrl1() != null ? feedback.getPictureUrl1() : null);
-            workOrderVo.setPictureUrl2(feedback.getPictureUrl2() != null ? feedback.getPictureUrl2() : null);
-            workOrderVo.setPictureUrl3(feedback.getPictureUrl3() != null ? feedback.getPictureUrl3() : null);
-        }
+        workOrderVo.setFeedbackList(feedbackList);
 
         return workOrderVo;
     }