From bf60e979c69a0b063e106fea27ccdb22fe3b32dc Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 19 十二月 2024 13:06:18 +0800
Subject: [PATCH] 房屋加入有效期能力 修改可以修改结束时间 主要应付园区房屋租赁
---
service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
index f5a279a..951a012 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
@@ -9,6 +9,7 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.unit.UnitDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.*;
@@ -17,10 +18,7 @@
import com.java110.po.room.RoomAttrPo;
import com.java110.po.room.RoomPo;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
@@ -110,7 +108,7 @@
}
//鑾峰彇鎴垮眿鐘舵��
String state = reqJson.getString("state");
- if (!StringUtil.isEmpty(state) && state.equals("2006")) { //宸插嚭绉�
+ if (RoomDto.STATE_SHOP_FIRE.equals(state)) { //宸插嚭绉�
//鑾峰彇璧风鏃堕棿
Date startTime = null;
Date endTime = null;
@@ -132,7 +130,7 @@
unitDto.setUnitId(reqJson.getString("unitId"));
//鏍￠獙灏忓尯妤糏D鍜屽皬鍖烘槸鍚︽湁瀵瑰簲鍏崇郴
List<UnitDto> units = unitInnerServiceSMOImpl.queryUnitsByCommunityId(unitDto);
- if (units == null || units.size() < 1) {
+ if (ListUtil.isNull(units)) {
throw new IllegalArgumentException("浼犲叆鍗曞厓ID涓嶆槸璇ュ皬鍖虹殑鍗曞厓");
}
Assert.judgeAttrValue(reqJson);
@@ -142,16 +140,10 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
updateShellRoom(reqJson, cmdDataFlowContext);
- String state = reqJson.getString("state");
- if (!StringUtil.isEmpty(state) && state.equals("2006")) { //宸插嚭绉�
- OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setRoomId(reqJson.getString("roomId"));
- List<OwnerRoomRelDto> ownerRoomRelDtoList = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtoList.get(0), OwnerRoomRelPo.class);
- ownerRoomRelPo.setStartTime(reqJson.getString("startTime"));
- ownerRoomRelPo.setEndTime(reqJson.getString("endTime") + " 23:59:59");
- ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
- }
+
+ // todo 淇敼绉熸湡
+ modifyRoomRateTime(reqJson,cmdDataFlowContext);
+
if (!reqJson.containsKey("attrs")) {
return;
}
@@ -189,6 +181,34 @@
}
/**
+ * 淇敼绉熸湡
+ * @param reqJson
+ * @param cmdDataFlowContext
+ */
+ private void modifyRoomRateTime(JSONObject reqJson, ICmdDataFlowContext cmdDataFlowContext) {
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(reqJson.getString("roomId"));
+ List<OwnerRoomRelDto> ownerRoomRelDtoList = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ if(ListUtil.isNull(ownerRoomRelDtoList)){
+ return ;
+ }
+ String state = reqJson.getString("state");
+ if (RoomDto.STATE_SHOP_FIRE.equals(state)) { //宸插嚭绉�
+ OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtoList.get(0), OwnerRoomRelPo.class);
+ ownerRoomRelPo.setStartTime(reqJson.getString("startTime"));
+ ownerRoomRelPo.setEndTime(reqJson.getString("endTime") + " 23:59:59");
+ ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+ return;
+ }
+ String endTime = reqJson.getString("endTime");
+ if(!StringUtil.isEmpty(endTime)){
+ OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtoList.get(0), OwnerRoomRelPo.class);
+ ownerRoomRelPo.setEndTime(endTime + " 23:59:59");
+ ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+ }
+ }
+
+ /**
* 娣诲姞灏忓尯妤间俊鎭�
*
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
--
Gitblit v1.8.0