Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusDoorLockController.java

@@ -196,8 +196,8 @@ public class BusDoorLockController extends JeecgController<BusDoorLock, IBusDoor
 				doorLock.setFloorId(item.getFloorId());
 				doorLock.setRoomId(item.getId());
 				String association = "";
-				String roomNumber = item.getPrefix()+item.getName();
-
+//				String roomNumber = item.getPrefix()+item.getName();
+				String roomNumber = item.getName();
 				switch (doorLockDto.radioType) {
 					case "1":
 						association = roomNumber;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusNightTrialController.java

@@ -221,6 +221,7 @@ public class BusNightTrialController extends JeecgController<BusNightTrial, IBus
 		 if (busNightTrial.getId() != null && !busNightTrial.getId().equals("")){
 			 BusNightTrial editModel = busNightTrialService.getById(busNightTrial.getId());
 			 editModel.setAutoHand(busNightTrial.getAutoHand());
+			 editModel.setRoomToDirty(busNightTrial.getRoomToDirty());
 			 busNightTrialService.updateById(editModel);
 			 return Result.OK(editModel);
 		 }else{

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusOtherRoomCardController.java

@@ -220,6 +220,7 @@ public class BusOtherRoomCardController extends JeecgController<BusOtherRoomCard
 		 if (busOtherRoomCard.getId() != null && !busOtherRoomCard.getId().equals("")){
 			 BusOtherRoomCard editModel = busOtherRoomCardService.getById(busOtherRoomCard.getId());
 			 editModel.setStatus(busOtherRoomCard.getStatus());
+			 editModel.setLogoutCard(busOtherRoomCard.getLogoutCard());
 			 busOtherRoomCardService.updateById(editModel);
 			 return Result.OK(editModel);
 		 }else{

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusYezhuController.java

@@ -7,12 +7,21 @@ import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.BusYezhu;
+import org.jeecg.modules.business.entity.BusYezhuInRoom;
+import org.jeecg.modules.business.service.IBusYezhuInRoomService;
 import org.jeecg.modules.business.service.IBusYezhuService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +29,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +63,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class BusYezhuController extends JeecgController<BusYezhu, IBusYezhuService> {
 	@Autowired
 	private IBusYezhuService busYezhuService;
-
+	@Resource
+	private IBusYezhuInRoomService busYezhuInRoomService;
+@Resource
+private CesRoomsServiceImpl cesRoomsService;
+@Resource
+private ISysUserService sysUserService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,6 +88,25 @@ public class BusYezhuController extends JeecgController<BusYezhu, IBusYezhuServi
 		QueryWrapper<BusYezhu> queryWrapper = QueryGenerator.initQueryWrapper(busYezhu, req.getParameterMap());
 		Page<BusYezhu> page = new Page<BusYezhu>(pageNo, pageSize);
 		IPage<BusYezhu> pageList = busYezhuService.page(page, queryWrapper);
+		pageList.getRecords().forEach(t -> {
+			LambdaQueryWrapper<BusYezhuInRoom> lambdaQueryWrapper = new LambdaQueryWrapper<BusYezhuInRoom>();
+			lambdaQueryWrapper.eq(BusYezhuInRoom::getBusYezhuId, t.getId());
+			List<BusYezhuInRoom> list = busYezhuInRoomService.list(lambdaQueryWrapper);
+			if (ObjectUtils.isNotEmpty(list)) {
+				list.forEach(i -> {
+					CesRooms rooms = cesRoomsService.getById(i.getRoomId());
+					if (rooms != null) {
+						i.setRoomName(rooms.getName());
+					}
+				});
+			}
+			t.setInRoomList(list);
+			SysUser sysUser = sysUserService.getById(t.getSysUserId());
+			if (sysUser != null) {
+				t.setUserName(sysUser.getRealname());
+				t.setName(sysUser.getUsername());
+			}
+		});
 		return Result.OK(pageList);
 	}
 
@@ -84,6 +121,20 @@ public class BusYezhuController extends JeecgController<BusYezhu, IBusYezhuServi
 	//@RequiresPermissions("business:bus_yezhu:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusYezhu busYezhu) {
+		if (busYezhu.getTenantId() == null || busYezhu.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				busYezhu.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		LambdaQueryWrapper<BusYezhu> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BusYezhu::getSysUserId, busYezhu.getSysUserId());
+		Long count = busYezhuService.count(lambdaQueryWrapper);
+		if (count > 0) {
+			return Result.error("该账号已添加过");
+		}
 		busYezhuService.save(busYezhu);
 		return Result.OK("添加成功！");
 	}
@@ -115,6 +166,9 @@ public class BusYezhuController extends JeecgController<BusYezhu, IBusYezhuServi
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		busYezhuService.removeById(id);
+		LambdaQueryWrapper<BusYezhuInRoom> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BusYezhuInRoom::getBusYezhuId, id);
+		busYezhuInRoomService.remove(lambdaQueryWrapper);
 		return Result.OK("删除成功!");
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusYezhuInRoomController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -76,15 +78,18 @@ public class BusYezhuInRoomController extends JeecgController<BusYezhuInRoom, IB
 	/**
 	 *   添加
 	 *
-	 * @param busYezhuInRoom
+	 * @param busYezhuInRooms
 	 * @return
 	 */
 	@AutoLog(value = "bus_yezhu_in_room-添加")
 	@ApiOperation(value="bus_yezhu_in_room-添加", notes="bus_yezhu_in_room-添加")
 	//@RequiresPermissions("business:bus_yezhu_in_room:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody BusYezhuInRoom busYezhuInRoom) {
-		busYezhuInRoomService.save(busYezhuInRoom);
+	public Result<String> add(@RequestBody List<BusYezhuInRoom> busYezhuInRooms) {
+		LambdaQueryWrapper<BusYezhuInRoom> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BusYezhuInRoom::getBusYezhuId, busYezhuInRooms.get(0).getBusYezhuId());
+		busYezhuInRoomService.remove(lambdaQueryWrapper);
+		busYezhuInRoomService.saveBatch(busYezhuInRooms);
 		return Result.OK("添加成功！");
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusNightTrial.java

@@ -90,4 +90,9 @@ public class BusNightTrial implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**住房转脏房*/
+    @Excel(name = "住房转脏房", width = 15)
+    @ApiModelProperty(value = "住房转脏房")
+    private Boolean roomToDirty;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusOtherRoomCard.java

@@ -69,4 +69,9 @@ public class BusOtherRoomCard implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**结账离店时，是否强制性先注销房卡，才能结账*/
+    @Excel(name = "结账离店时，是否强制性先注销房卡，才能结账", width = 15)
+    @ApiModelProperty(value = "结账离店时，是否强制性先注销房卡，才能结账")
+    private Boolean logoutCard;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusYezhu.java

@@ -4,10 +4,9 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -52,4 +51,13 @@ public class BusYezhu implements Serializable {
 	@Excel(name = "分成比例", width = 15)
     @ApiModelProperty(value = "分成比例")
     private Integer commission;
+
+	@TableField(exist = false)
+	private String userName;
+
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private List<BusYezhuInRoom> inRoomList;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusYezhuInRoom.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -44,4 +42,7 @@ public class BusYezhuInRoom implements Serializable {
 	@Excel(name = "房间id", width = 15)
     @ApiModelProperty(value = "房间id")
     private String roomId;
+
+    @TableField(exist = false)
+    private String roomName;
 }