From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'

---
 java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java |   64 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java b/java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java
index c048f7a..beef50e 100644
--- a/java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java
@@ -25,7 +25,6 @@
     public static final String STATE_BACK = "1200";
     //杞崟
     public static final String STATE_TRANSFER = "1300";
-
     //鐢宠鏀粯
     public static final String STATE_PAY = "1400";
     //鏀粯澶辫触
@@ -40,8 +39,13 @@
     public static final String STATE_UNPROCESSED = "2000";
 
     public static final String REPAIR_WAY_GRABBING = "100"; //鎶㈠崟妯″紡
-    public static final String REPAIR_WAY_TRAINING = "300"; //鎶㈠崟妯″紡
+    public static final String REPAIR_WAY_ASSIGN = "200"; //鎸囨淳妯″紡
+    public static final String REPAIR_WAY_TRAINING = "300"; //杞妯″紡
 
+    //鎶ヤ慨娓犻亾  D鍛樺伐浠e鎶ヤ慨  T鐢佃瘽鎶ヤ慨 Z涓氫富鑷富淇濅慨
+    public static final String REPAIR_CHANNEL_STAFF = "D"; //D鍛樺伐浠e鎶ヤ慨
+    public static final String REPAIR_CHANNEL_TEL = "T"; //T鐢佃瘽鎶ヤ慨
+    public static final String REPAIR_CHANNEL_OWNER = "Z"; //Z涓氫富鑷富淇濅慨
 
     private String repairName;
     private String appointmentTime;
@@ -82,6 +86,13 @@
     private String startRuId;
     private String preRuId;
     private String ruId;
+
+    private String returnVisitFlagName;
+    private String publicArea;
+    private String repairChannel;
+    private String maintenanceType;
+    private String reqSource;
+    private List<String> repairChannels;
 
     //涓氫富涓婁紶缁翠慨鍥剧墖
     private List<PhotoVo> repairPhotos;
@@ -372,4 +383,53 @@
     public void setAfterPhotos(List<PhotoVo> afterPhotos) {
         this.afterPhotos = afterPhotos;
     }
+
+    public String getReturnVisitFlagName() {
+        return returnVisitFlagName;
+    }
+
+    public void setReturnVisitFlagName(String returnVisitFlagName) {
+        this.returnVisitFlagName = returnVisitFlagName;
+    }
+
+    public String getPublicArea() {
+        return publicArea;
+    }
+
+    public void setPublicArea(String publicArea) {
+        this.publicArea = publicArea;
+    }
+
+    public String getRepairChannel() {
+        return repairChannel;
+    }
+
+    public void setRepairChannel(String repairChannel) {
+        this.repairChannel = repairChannel;
+    }
+
+    public String getMaintenanceType() {
+        return maintenanceType;
+    }
+
+    public void setMaintenanceType(String maintenanceType) {
+        this.maintenanceType = maintenanceType;
+    }
+
+
+    public String getReqSource() {
+        return reqSource;
+    }
+
+    public void setReqSource(String reqSource) {
+        this.reqSource = reqSource;
+    }
+
+    public List<String> getRepairChannels() {
+        return repairChannels;
+    }
+
+    public void setRepairChannels(List<String> repairChannels) {
+        this.repairChannels = repairChannels;
+    }
 }

--
Gitblit v1.8.0