From c7fc6381b7cefe7766c0937d53f58b62d6988d9d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 19 八月 2023 13:21:01 +0800
Subject: [PATCH] 优化代码

---
 java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java |  138 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
index 0a7d80c..c87bb76 100755
--- a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
@@ -1,8 +1,6 @@
 package com.java110.dto.owner;
 
 import com.java110.dto.PageDto;
-import com.java110.dto.RoomAttrDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -22,12 +20,21 @@
     public static final String STATE_OWE = "2002";
     public static final String STATE_FINISH = "3003";
 
-
     public static final String CAR_TYPE_PRIMARY = "1001"; //涓昏溅杈�
     public static final String CAR_TYPE_MEMBER = "1002"; //杞﹁締鎴愬憳
     public static final String CAR_TYPE_TEMP = "1003"; //涓存椂杞�
 
     public static final String CAR_TYPE_CD_TEMP = "1003";
+
+    public static final String LEASE_TYPE_MONTH = "H"; // 鏈堢杞�
+    public static final String LEASE_TYPE_SALE = "S"; // 鍑哄敭杞�
+    public static final String LEASE_TYPE_INNER = "I"; //鍐呴儴杞�
+    public static final String LEASE_TYPE_NO_MONEY = "NM"; //鍏嶈垂杞�
+    public static final String LEASE_TYPE_RESERVE = "R"; //棰勭害杞�
+
+    public static final String LEASE_TYPE_TEMP = "T";//涓存椂杞�
+
+    public static final String CAR_TYPE_CREDIT = "9906"; //淇＄敤鏈熻溅鐗�
 
     private String carColor;
     private String carBrand;
@@ -35,10 +42,13 @@
     private String carTypeName;
     private String carNum;
     private String carNumLike;
+    private String memberCarNum;
+    private String memberCarNumLike;
     private String[] carNums;
     private String communityId;
     private String psId;
     private String[] psIds;
+    private String[] paIds;
     private String remark;
     private String ownerId;
     private String userId;
@@ -59,6 +69,8 @@
     private Date endTime;
     private String state;
     private String stateName;
+    private String iotStateName;
+    private String iotRemark;
 
     private String areaNum;
 
@@ -72,6 +84,7 @@
 
     private String bId;
     private String carTypeCd;
+    private String carTypeCdName;
     private String[] carTypeCds;
     private String memberId;
     private String unitId;
@@ -80,8 +93,20 @@
     private String roomNum;
     private String oweAmount;
 
-    private List<OwnerCarAttrDto> ownerCarAttrDto;
+    private String leaseType;
+    private String[] leaseTypes;
 
+    private String leaseTypeName;
+
+    private String memberCarCount;
+
+    private String userName;
+
+    private String operate;
+
+    private String staffNameLike;
+
+    private List<OwnerCarAttrDto> ownerCarAttrDto;
 
     public String getCarColor() {
         return carColor;
@@ -154,7 +179,6 @@
     public void setCarId(String carId) {
         this.carId = carId;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -419,4 +443,108 @@
     public void setOwnerCarAttrDto(List<OwnerCarAttrDto> ownerCarAttrDto) {
         this.ownerCarAttrDto = ownerCarAttrDto;
     }
+
+    public String getLeaseType() {
+        return leaseType;
+    }
+
+    public void setLeaseType(String leaseType) {
+        this.leaseType = leaseType;
+    }
+
+    public String getLeaseTypeName() {
+        return leaseTypeName;
+    }
+
+    public void setLeaseTypeName(String leaseTypeName) {
+        this.leaseTypeName = leaseTypeName;
+    }
+
+    public String[] getPaIds() {
+        return paIds;
+    }
+
+    public void setPaIds(String[] paIds) {
+        this.paIds = paIds;
+    }
+
+    public String getCarTypeCdName() {
+        return carTypeCdName;
+    }
+
+    public void setCarTypeCdName(String carTypeCdName) {
+        this.carTypeCdName = carTypeCdName;
+    }
+
+    public String[] getLeaseTypes() {
+        return leaseTypes;
+    }
+
+    public void setLeaseTypes(String[] leaseTypes) {
+        this.leaseTypes = leaseTypes;
+    }
+
+    public String getMemberCarCount() {
+        return memberCarCount;
+    }
+
+    public void setMemberCarCount(String memberCarCount) {
+        this.memberCarCount = memberCarCount;
+    }
+
+    public String getMemberCarNum() {
+        return memberCarNum;
+    }
+
+    public void setMemberCarNum(String memberCarNum) {
+        this.memberCarNum = memberCarNum;
+    }
+
+    public String getMemberCarNumLike() {
+        return memberCarNumLike;
+    }
+
+    public void setMemberCarNumLike(String memberCarNumLike) {
+        this.memberCarNumLike = memberCarNumLike;
+    }
+
+    public String getIotStateName() {
+        return iotStateName;
+    }
+
+    public void setIotStateName(String iotStateName) {
+        this.iotStateName = iotStateName;
+    }
+
+    public String getIotRemark() {
+        return iotRemark;
+    }
+
+    public void setIotRemark(String iotRemark) {
+        this.iotRemark = iotRemark;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
 }

--
Gitblit v1.8.0