From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDto.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDto.java b/java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDto.java
index 6200388..a379268 100644
--- a/java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDto.java
@@ -26,12 +26,16 @@
* 5005 璐圭敤淇℃伅
* 6006 杞︿綅杞﹁締
*/
- public static final String LOG_TYPE_FLOOR_UNIT_IMPORT = "1001";
+ public static final String LOG_TYPE_FLOOR_UNIT_IMPORT = "importRoomOwner";
public static final String LOG_TYPE_HISTORY_FEE_IMPORT = "2002";
public static final String LOG_TYPE_OWENR_IMPORT = "3003";
public static final String LOG_TYPE_ROOM_IMPORT = "4004";
public static final String LOG_TYPE_FEE_IMPORT = "5005";
public static final String LOG_TYPE_AREA_PARKING_IMPORT = "6006";
+
+ public static final String STATE_WAIT_IMPORT = "W";//鐘舵�� W 寰呭鐞� D 澶勭悊涓� C 澶勭悊瀹屾垚
+ public static final String STATE_DOING_IMPORT = "D";//鐘舵�� W 寰呭鐞� D 澶勭悊涓� C 澶勭悊瀹屾垚
+ public static final String STATE_COMPLETE_IMPORT = "C";//鐘舵�� W 寰呭鐞� D 澶勭悊涓� C 澶勭悊瀹屾垚
private String logType;
private String logTypeName;
@@ -40,6 +44,13 @@
private String remark;
private String communityId;
private Long errorCount;
+ private Long waitCount;
+
+ private String state;
+
+
+ private String stateName;
+
List<AssetImportLogDetailDto> assetImportLogDetailDtos;
@@ -133,4 +144,28 @@
public void setLogTypeName(String logTypeName) {
this.logTypeName = logTypeName;
}
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
+
+ public Long getWaitCount() {
+ return waitCount;
+ }
+
+ public void setWaitCount(Long waitCount) {
+ this.waitCount = waitCount;
+ }
}
--
Gitblit v1.8.0