From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
old mode 100644
new mode 100755
index 43fcb83..5b36f10
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -42,7 +42,6 @@
import java.util.Date;
import java.util.List;
-
@RestController
@RequestMapping(value = "/roomRenovation")
public class RoomRenovationApi {
@@ -153,15 +152,23 @@
RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
roomRenovationPo.setStartTime(roomRenovationPo.getStartTime() + " 00:00:00");
roomRenovationPo.setEndTime(roomRenovationPo.getEndTime() + " 23:59:59");
- //濡傛灉鐘舵�佷负瑁呬慨涓紝鍒欐埧灞嬬姸鎬佹敼涓鸿淇腑锛涘鏋滅姸鎬佷负楠屾敹鎴愬姛锛屽垯鎴垮眿鐘舵�佹敼涓哄凡瑁呬慨
- if (roomRenovationPo.getState().equals("3000")) {
+ //濡傛灉鐘舵�佷负瑁呬慨涓�佸緟楠屾敹锛屽垯鎴垮眿鐘舵�佹敼涓鸿淇腑锛涘鏋滅姸鎬佷负楠屾敹鎴愬姛锛屽垯鎴垮眿鐘舵�佹敼涓哄凡瑁呬慨锛涘鏋滀负寰呭鏍搞�佸鏍稿け璐ャ�侀獙鏀跺け璐ワ紝鍒欐埧灞嬬姸鎬佹敼涓哄凡浜ゆ埧
+ if (roomRenovationPo.getState().equals("3000") || roomRenovationPo.getState().equals("4000")) {
RoomDto roomDto = new RoomDto();
roomDto.setRoomId(roomRenovationPo.getRoomId());
//鎴垮眿鐘舵�佸彉涓鸿淇腑
roomDto.setState("2009");
updateRoomRenovationBMOImpl.update(roomRenovationPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
- } else if (roomRenovationPo.getState().equals("")) {
+ } else if (roomRenovationPo.getState().equals("1000") || roomRenovationPo.getState().equals("2000")
+ || roomRenovationPo.getState().equals("5000")) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(roomRenovationPo.getRoomId());
+ //鎴垮眿鐘舵�佸彉涓哄凡浜ゆ埧
+ roomDto.setState("2003");
+ updateRoomRenovationBMOImpl.update(roomRenovationPo);
+ return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationPo.getState().equals("6000")) {
RoomDto roomDto = new RoomDto();
roomDto.setRoomId(roomRenovationPo.getRoomId());
//鎴垮眿鐘舵�佸彉涓哄凡瑁呬慨
@@ -278,6 +285,8 @@
String rId = roomRenovationPo.getrId();
//鐘舵��
String state = roomRenovationPo.getState();
+ //鏄惁杩濊
+ String isTrue = roomRenovationPo.getIsTrue();
//鏌ヨ褰撳墠鐢ㄦ埛淇℃伅
UserDto userDto = new UserDto();
userDto.setUserId(userId);
@@ -292,6 +301,7 @@
roomRenovationRecordPo.setCreateTime(format.format(new Date()));
roomRenovationRecordPo.setStaffId(userId);
roomRenovationRecordPo.setStaffName(users.get(0).getName());
+ roomRenovationRecordPo.setIsTrue(isTrue);
saveRoomRenovationRecordBMO.saveRecord(roomRenovationRecordPo);
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
@@ -319,15 +329,8 @@
if (!StringUtil.isEmpty(videoName)) {
//21000琛ㄧず瑁呬慨瑙嗛
fileRelPo.setRelTypeCd("21000");
- FileDto fileDto = new FileDto();
- fileDto.setCommunityId("-1");
- fileDto.setContext(videoName);
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setSuffix("mp4");
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- fileRelPo.setFileRealName(fileName);
- fileRelPo.setFileSaveName(fileName);
+ fileRelPo.setFileRealName(videoName);
+ fileRelPo.setFileSaveName(videoName);
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
}
RoomRenovationRecordPo roomRenovationRecord = new RoomRenovationRecordPo();
@@ -352,6 +355,14 @@
roomDto.setRoomId(roomRenovationPo.getRoomId());
//鎴垮眿鐘舵�佸彉涓鸿淇腑
roomDto.setState("2009");
+ //鏇存柊瑁呬慨淇℃伅
+ updateRoomRenovationBMOImpl.update(roomRenovationPo);
+ return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationPo.getState().equals("2000")) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(roomRenovationPo.getRoomId());
+ //鎴垮眿鐘舵�佸彉涓哄凡浜ゆ埧
+ roomDto.setState("2003");
//鏇存柊瑁呬慨淇℃伅
updateRoomRenovationBMOImpl.update(roomRenovationPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
@@ -390,6 +401,7 @@
@RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "personName", required = false) String personName,
@RequestParam(value = "personTel", required = false) String personTel,
+ @RequestParam(value = "state", required = false) String state,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "page", required = false) int page,
@RequestParam(value = "row", required = false) int row) {
@@ -401,6 +413,7 @@
roomRenovationDto.setRoomName(roomName);
roomRenovationDto.setPersonName(personName);
roomRenovationDto.setPersonTel(personTel);
+ roomRenovationDto.setState(state);
roomRenovationDto.setUserId(userId);
return getRoomRenovationBMOImpl.get(roomRenovationDto);
}
@@ -436,8 +449,19 @@
roomDto.setRoomId(reqJson.getString("roomId"));
//鐘舵�佸彉涓哄凡瑁呬慨
roomDto.setState("2005");
+ //楠屾敹鎴愬姛
+ roomRenovationDetailPo.setState("3000");
saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationDetailPo.getState().equals("6000")) { //楠屾敹澶辫触瑁呬慨鐘舵�佸彉涓鸿淇腑
+ RoomRenovationPo roomRenovation = new RoomRenovationPo();
+ roomRenovation.setrId(roomRenovationDetailPo.getrId());
+ roomRenovation.setState("3000");
+ //楠屾敹澶辫触鎶婃埧灞嬬姸鎬佸彉涓鸿淇腑锛岃涓氫富瑁呬慨鏁存敼
+ updateRoomRenovationBMOImpl.update(roomRenovation);
+ //楠屾敹澶辫触
+ roomRenovationDetailPo.setState("4000");
+ return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
} else {
return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
}
--
Gitblit v1.8.0