Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java

@@ -285,6 +285,8 @@
        String rId = roomRenovationPo.getrId();
        //状态
        String state = roomRenovationPo.getState();
        //是否违规
        String isTrue = roomRenovationPo.getIsTrue();
        //查询当前用户信息
        UserDto userDto = new UserDto();
        userDto.setUserId(userId);
@@ -299,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));
@@ -398,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) {
@@ -409,6 +413,7 @@
        roomRenovationDto.setRoomName(roomName);
        roomRenovationDto.setPersonName(personName);
        roomRenovationDto.setPersonTel(personTel);
        roomRenovationDto.setState(state);
        roomRenovationDto.setUserId(userId);
        return getRoomRenovationBMOImpl.get(roomRenovationDto);
    }
@@ -444,15 +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")) {
            RoomDto roomDto = new RoomDto();
            roomDto.setRoomId(reqJson.getString("roomId"));
            //状态变为已交房
            roomDto.setState("2003");
            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);
        }