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/fw/controller/FwRoomCleanController.java

@@ -8,6 +8,8 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TokenUtils;
+import org.jeecg.modules.business.entity.*;
+import org.jeecg.modules.business.service.IBusWaiterService;
 import org.jeecg.modules.fw.dto.RoomCleanDto;
 import org.jeecg.modules.fw.dto.RoomLockDto;
 import org.jeecg.modules.fw.entity.FwRoomClean;
@@ -45,6 +47,8 @@ public class FwRoomCleanController extends JeecgController<FwRoomClean, IFwRoomC
 	private IFwRoomCleanService fwRoomCleanService;
 	 @Autowired
 	 private CesRoomsServiceImpl cesRoomsService;
+	 @Autowired
+	 private IBusWaiterService busWaiterService;
 	/**
 	 * 分页列表查询
 	 *
@@ -64,6 +68,12 @@ public class FwRoomCleanController extends JeecgController<FwRoomClean, IFwRoomC
 		QueryWrapper<FwRoomClean> queryWrapper = QueryGenerator.initQueryWrapper(fwRoomClean, req.getParameterMap());
 		Page<FwRoomClean> page = new Page<FwRoomClean>(pageNo, pageSize);
 		IPage<FwRoomClean> pageList = fwRoomCleanService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			BusWaiter waiter = busWaiterService.getById(item.getWaiterId());
+			if (waiter != null) {
+				item.setWaiterName(waiter.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/fw/controller/FwRoomLockController.java

@@ -5,11 +5,13 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.date.DateUtil;
 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.system.query.QueryGenerator;
 import org.jeecg.common.util.TokenUtils;
+import org.jeecg.modules.business.entity.BusMemberCard;
 import org.jeecg.modules.fw.dto.RoomLockDto;
 import org.jeecg.modules.fw.entity.FwRoomLock;
 import org.jeecg.modules.fw.service.IFwRoomLockService;
@@ -61,8 +63,16 @@ public class FwRoomLockController extends JeecgController<FwRoomLock, IFwRoomLoc
 	public Result<IPage<FwRoomLock>> queryPageList(FwRoomLock fwRoomLock,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   @RequestParam(name="startTime",required = false) String startTime,
+												   @RequestParam(name="endTime",required = false) String endTime,
 								   HttpServletRequest req) {
-		QueryWrapper<FwRoomLock> queryWrapper = QueryGenerator.initQueryWrapper(fwRoomLock, req.getParameterMap());
+		LambdaQueryWrapper<FwRoomLock> queryWrapper = QueryGenerator.initQueryWrapper(fwRoomLock, req.getParameterMap()).lambda();
+		if (ObjectUtils.isNotEmpty(startTime)) {
+			queryWrapper.ge(FwRoomLock::getCreateTime, DateUtil.parseDate(startTime));
+		}
+		if (ObjectUtils.isNotEmpty(endTime)) {
+			queryWrapper.le(FwRoomLock::getCreateTime, DateUtil.parseDate(endTime));
+		}
 		Page<FwRoomLock> page = new Page<FwRoomLock>(pageNo, pageSize);
 		IPage<FwRoomLock> pageList = fwRoomLockService.page(page, queryWrapper);
 		return Result.OK(pageList);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/fw/controller/FwRoomRepairController.java

@@ -1,15 +1,19 @@
 package org.jeecg.modules.fw.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TokenUtils;
+import org.jeecg.modules.business.entity.BusMemberCard;
 import org.jeecg.modules.fw.dto.RoomRepairDto;
 import org.jeecg.modules.fw.entity.FwRoomRepair;
 import org.jeecg.modules.fw.service.IFwRoomRepairService;
@@ -60,8 +64,19 @@ public class FwRoomRepairController extends JeecgController<FwRoomRepair, IFwRoo
 	public Result<IPage<FwRoomRepair>> queryPageList(FwRoomRepair fwRoomRepair,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													 @RequestParam(name="startTime",required = false) String startTime,
+													 @RequestParam(name="endTime",required = false) String endTime,
 								   HttpServletRequest req) {
-		QueryWrapper<FwRoomRepair> queryWrapper = QueryGenerator.initQueryWrapper(fwRoomRepair, req.getParameterMap());
+		LambdaQueryWrapper<FwRoomRepair> queryWrapper = QueryGenerator.initQueryWrapper(fwRoomRepair, req.getParameterMap()).lambda();
+		if (ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime)) {
+			queryWrapper.and(j -> {
+				j.ge(FwRoomRepair::getStartDate, DateUtil.parseDate(startTime));
+				j.le(FwRoomRepair::getStartDate, DateUtil.parseDate(startTime));
+			}).or().and(i->{
+				i.le(FwRoomRepair::getStartDate, DateUtil.parseDate(endTime));
+				i.ge(FwRoomRepair::getStartDate, DateUtil.parseDate(endTime));
+			});
+		}
 		Page<FwRoomRepair> page = new Page<FwRoomRepair>(pageNo, pageSize);
 		IPage<FwRoomRepair> pageList = fwRoomRepairService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -125,6 +140,7 @@ public class FwRoomRepairController extends JeecgController<FwRoomRepair, IFwRoo
 		 LambdaUpdateWrapper<FwRoomRepair> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
 		 lambdaUpdateWrapper.in(FwRoomRepair::getRoomId, Arrays.asList(roomIds.split(",")));
 		 lambdaUpdateWrapper.set(FwRoomRepair::getStatus,2);
+		 lambdaUpdateWrapper.set(FwRoomRepair::getCreateTime,new Date());
 		 this.fwRoomRepairService.update(lambdaUpdateWrapper);
 
 		 List<String> list = Arrays.asList(roomIds.split(","));

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/fw/entity/FwRoomClean.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;
@@ -64,4 +62,12 @@ public class FwRoomClean implements Serializable {
 	@Excel(name = "打扫状态 0未打扫 1已打扫", width = 15)
     @ApiModelProperty(value = "打扫状态 0未打扫 1已打扫")
     private Integer state;
+    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @TableField(exist = false)
+    private String waiterName;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/fw/entity/FwRoomLock.java

@@ -56,4 +56,10 @@ public class FwRoomLock implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/fw/entity/FwRoomRepair.java

@@ -72,4 +72,10 @@ public class FwRoomRepair implements Serializable {
 	@Excel(name = "状态 1正在进行 2已完成维修", width = 15)
     @ApiModelProperty(value = "状态 1正在进行 2已完成维修")
     private Integer status;
+
+    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }