From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/repair/RepairUserDto.java | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 262 insertions(+), 8 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/repair/RepairUserDto.java b/java110-bean/src/main/java/com/java110/dto/repair/RepairUserDto.java
old mode 100644
new mode 100755
index 362721c..e09105c
--- a/java110-bean/src/main/java/com/java110/dto/repair/RepairUserDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/repair/RepairUserDto.java
@@ -1,9 +1,11 @@
package com.java110.dto.repair;
import com.java110.dto.PageDto;
+import com.java110.vo.api.junkRequirement.PhotoVo;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @ClassName FloorDto
@@ -20,38 +22,91 @@
//瀹℃牳鐢ㄦ埛
public static final String REPAIR_EVENT_AUDIT_USER = "auditUser";
- public static final String STATE_DOING = "10001";// 澶勭悊涓�
- public static final String STATE_CLOSE = "10002";// 缁撳崟
- public static final String STATE_BACK = "10003";// 閫�鍗�
- public static final String STATE_TRANSFER = "10004";// 杞崟
- public static final String STATE_SUBMIT = "10005";// 鎻愪氦
+ public static final String REPAIR_EVENT_PAY_USER = "payUser";
-
+ public static final String STATE_DOING = "10001";// 澶勭悊涓�
+ public static final String STATE_CLOSE = "10002";// 缁撳崟
+ public static final String STATE_BACK = "10003";// 閫�鍗�
+ public static final String STATE_TRANSFER = "10004";// 杞崟
+ public static final String STATE_SUBMIT = "10005";// 鎻愪氦
+ public static final String STATE_DISPATCH = "10006";//娲惧崟
+ public static final String STATE_FINISH = "10007";//璇勪环瀹屾垚
+ public static final String STATE_FINISH_VISIT = "10008";//宸插洖璁�
+ public static final String STATE_PAY_FEE = "10009";//寰呮敮浠�
+ public static final String STATE_EVALUATE = "11000";//寰呰瘎浠�
+ public static final String STATE_FINISH_PAY_FEE = "12000";//宸叉敮浠�
+ public static final String STATE_STOP = "12001";//鏆傚仠
private String context;
private String repairId;
private String[] repairIds;
private String ruId;
private String state;
+ private String[] states;
private String stateName;
private String communityId;
private String userId;
private String userName;
+ private String bId;
private String staffId;
private String staffName;
private String preStaffId;
private String preStaffName;
+ private String preRuId;
private Date startTime;
private Date endTime;
private String repairEvent;
private String duration;
-
private Date createTime;
private String statusCd = "0";
+ //鎶ヤ慨鏁伴噺
+ private String amount;
+ //澶勭悊涓殑鎶ヤ慨鏁伴噺
+ private String dealAmount;
+ //缁撳崟鐨勬姤淇暟閲�
+ private String statementAmount;
+ //閫�鍗曠殑鎶ヤ慨鏁伴噺
+ private String chargebackAmount;
+ //杞崟鐨勬姤淇暟閲�
+ private String transferOrderAmount;
+ //娲惧崟鐨勬姤淇暟閲�
+ private String dispatchAmount;
+ //鍥炶鏁伴噺
+ private String returnAmount;
+ private String beginStartTime;
+ private String beginEndTime;
+ private String finishStartTime;
+ private String finishEndTime;
+ //鍛樺伐鎶ヤ慨琛ㄥ憳宸ヤ俊鎭�
+ private List<RepairUserDto> repairList;
+
+ //涓氫富涓婁紶鍥剧墖
+ private List<PhotoVo> photoVos;
+
+ //澶勭悊涓姤淇�绘潯鏁�
+ private String dealNumber;
+ //缁撳崟鎶ヤ慨鎬绘潯鏁�
+ private String statementNumber;
+ //閫�鍗曟姤淇�绘暟
+ private String chargebackNumber;
+ //杞崟鎶ヤ慨鎬绘暟
+ private String transferOrderNumber;
+ //娲惧崟鎶ヤ慨鎬绘暟
+ private String dispatchNumber;
+ //宸插洖璁挎�绘暟閲�
+ private String returnNumber;
+
+ //璇勫垎
+ private String score;
+
+ //鏀粯鏂瑰紡
+ private String payType;
+
+ private String payTypeName;
public String getContext() {
return context;
@@ -100,7 +155,6 @@
public void setUserId(String userId) {
this.userId = userId;
}
-
public Date getCreateTime() {
return createTime;
@@ -205,4 +259,204 @@
public void setDuration(String duration) {
this.duration = duration;
}
+
+ public String[] getStates() {
+ return states;
+ }
+
+ public void setStates(String[] states) {
+ this.states = states;
+ }
+
+ public String getPreRuId() {
+ return preRuId;
+ }
+
+ public void setPreRuId(String preRuId) {
+ this.preRuId = preRuId;
+ }
+
+ public String getbId() {
+ return bId;
+ }
+
+ public void setbId(String bId) {
+ this.bId = bId;
+ }
+
+ public String getAmount() {
+ return amount;
+ }
+
+ public void setAmount(String amount) {
+ this.amount = amount;
+ }
+
+ public String getBeginStartTime() {
+ return beginStartTime;
+ }
+
+ public void setBeginStartTime(String beginStartTime) {
+ this.beginStartTime = beginStartTime;
+ }
+
+ public String getBeginEndTime() {
+ return beginEndTime;
+ }
+
+ public void setBeginEndTime(String beginEndTime) {
+ this.beginEndTime = beginEndTime;
+ }
+
+ public String getFinishStartTime() {
+ return finishStartTime;
+ }
+
+ public void setFinishStartTime(String finishStartTime) {
+ this.finishStartTime = finishStartTime;
+ }
+
+ public String getFinishEndTime() {
+ return finishEndTime;
+ }
+
+ public void setFinishEndTime(String finishEndTime) {
+ this.finishEndTime = finishEndTime;
+ }
+
+ public String getDealAmount() {
+ return dealAmount;
+ }
+
+ public void setDealAmount(String dealAmount) {
+ this.dealAmount = dealAmount;
+ }
+
+ public String getStatementAmount() {
+ return statementAmount;
+ }
+
+ public void setStatementAmount(String statementAmount) {
+ this.statementAmount = statementAmount;
+ }
+
+ public String getChargebackAmount() {
+ return chargebackAmount;
+ }
+
+ public void setChargebackAmount(String chargebackAmount) {
+ this.chargebackAmount = chargebackAmount;
+ }
+
+ public String getTransferOrderAmount() {
+ return transferOrderAmount;
+ }
+
+ public void setTransferOrderAmount(String transferOrderAmount) {
+ this.transferOrderAmount = transferOrderAmount;
+ }
+
+ public String getDispatchAmount() {
+ return dispatchAmount;
+ }
+
+ public void setDispatchAmount(String dispatchAmount) {
+ this.dispatchAmount = dispatchAmount;
+ }
+
+ public List<RepairUserDto> getRepairList() {
+ return repairList;
+ }
+
+ public void setRepairList(List<RepairUserDto> repairList) {
+ this.repairList = repairList;
+ }
+
+ public List<PhotoVo> getPhotoVos() {
+ return photoVos;
+ }
+
+ public void setPhotoVos(List<PhotoVo> photoVos) {
+ this.photoVos = photoVos;
+ }
+
+ public String getDealNumber() {
+ return dealNumber;
+ }
+
+ public void setDealNumber(String dealNumber) {
+ this.dealNumber = dealNumber;
+ }
+
+ public String getStatementNumber() {
+ return statementNumber;
+ }
+
+ public void setStatementNumber(String statementNumber) {
+ this.statementNumber = statementNumber;
+ }
+
+ public String getChargebackNumber() {
+ return chargebackNumber;
+ }
+
+ public void setChargebackNumber(String chargebackNumber) {
+ this.chargebackNumber = chargebackNumber;
+ }
+
+ public String getTransferOrderNumber() {
+ return transferOrderNumber;
+ }
+
+ public void setTransferOrderNumber(String transferOrderNumber) {
+ this.transferOrderNumber = transferOrderNumber;
+ }
+
+ public String getDispatchNumber() {
+ return dispatchNumber;
+ }
+
+ public void setDispatchNumber(String dispatchNumber) {
+ this.dispatchNumber = dispatchNumber;
+ }
+
+ public String getReturnNumber() {
+ return returnNumber;
+ }
+
+ public void setReturnNumber(String returnNumber) {
+ this.returnNumber = returnNumber;
+ }
+
+ public String getReturnAmount() {
+ return returnAmount;
+ }
+
+ public void setReturnAmount(String returnAmount) {
+ this.returnAmount = returnAmount;
+ }
+
+ public String getScore() {
+ return score;
+ }
+
+ public void setScore(String score) {
+ this.score = score;
+ }
+
+ public String getPayType() {
+ return payType;
+ }
+
+ public void setPayType(String payType) {
+ this.payType = payType;
+ }
+
+ public String getPayTypeName() {
+ return payTypeName;
+ }
+
+ public void setPayTypeName(String payTypeName) {
+ this.payTypeName = payTypeName;
+ }
}
--
Gitblit v1.8.0