From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java
index fa37925..42a69c2 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java
@@ -18,11 +18,8 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
-import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.dto.ownerSettledRooms.OwnerSettledRoomsDto;
-import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
-import com.java110.dto.visit.VisitDto;
-import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.dto.owner.OwnerSettledRoomsDto;
+import com.java110.dto.owner.OwnerSettledSettingDto;
import com.java110.intf.community.IRoomV1InnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.intf.user.IOwnerSettledRoomsV1InnerServiceSMO;
@@ -31,17 +28,15 @@
import com.java110.po.room.RoomPo;
import com.java110.user.dao.IOwnerSettledApplyV1ServiceDao;
import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
-import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+import com.java110.dto.owner.OwnerSettledApplyDto;
import com.java110.po.ownerSettledApply.OwnerSettledApplyPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -82,7 +77,7 @@
public int updateOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
int saveFlag = ownerSettledApplyV1ServiceDaoImpl.updateOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
- if(saveFlag < 1 || !VisitDto.STATE_C.equals(ownerSettledApplyPo.getState())){
+ if(saveFlag < 1 || !OwnerSettledApplyDto.STATE_COMPLETE.equals(ownerSettledApplyPo.getState())){
return saveFlag;
}
--
Gitblit v1.8.0