物品租借

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderLeaseGoodsController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.order.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -9,8 +10,19 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 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 com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+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.DateUtils;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,8 +30,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.business.dto.PostDataDto;
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.entity.BusMarketCouponsCashUsed;
+import org.jeecg.modules.business.entity.BusMemberBalanceLog;
+import org.jeecg.modules.business.enums.CouponsStatusEnum;
+import org.jeecg.modules.business.service.IBusHotelService;
 import org.jeecg.modules.order.entity.CesOrderLeaseGoods;
 import org.jeecg.modules.order.service.ICesOrderLeaseGoodsService;
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +70,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseGoods, ICesOrderLeaseGoodsService> {
 	@Autowired
 	private ICesOrderLeaseGoodsService cesOrderLeaseGoodsService;
-	
+	 @Autowired
+	 private CesRoomsServiceImpl cesRoomsService;
 	/**
 	 * 分页列表查询
 	 *
@@ -66,12 +87,42 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 	public Result<IPage<CesOrderLeaseGoods>> queryPageList(CesOrderLeaseGoods cesOrderLeaseGoods,
 								   @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<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, req.getParameterMap());
+		LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, req.getParameterMap()).lambda();;
+		if (ObjectUtils.isNotEmpty(startTime)) {
+			queryWrapper.ge(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(startTime));
+		}
+		if (ObjectUtils.isNotEmpty(endTime)) {
+			queryWrapper.le(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(endTime));
+		}
 		Page<CesOrderLeaseGoods> page = new Page<CesOrderLeaseGoods>(pageNo, pageSize);
 		IPage<CesOrderLeaseGoods> pageList = cesOrderLeaseGoodsService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			CesRooms rooms = cesRoomsService.getById(item.getRoomId());
+			if (rooms != null) {
+				item.setRoomNo(rooms.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
+
+	 /**
+	  * 归还
+	  * @param dto
+	  * @return
+	  */
+	 @AutoLog(value = "归还")
+	 @ApiOperation(value="归还", notes="归还")
+	 @RequestMapping(value = "/revert", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> revert(@RequestBody PostDataDto dto) {
+		 LambdaUpdateWrapper<CesOrderLeaseGoods> updateWrapper = new UpdateWrapper().lambda();
+		 updateWrapper.set(CesOrderLeaseGoods::getRevertDate, new Date());
+		 updateWrapper.eq(CesOrderLeaseGoods::getId, dto.getId());
+		 cesOrderLeaseGoodsService.update(updateWrapper);
+		 return Result.OK("编辑成功!");
+	 }
 	
 	/**
 	 *   添加
@@ -84,6 +135,16 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 	//@RequiresPermissions("order:ces_order_lease_goods:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CesOrderLeaseGoods cesOrderLeaseGoods) {
+		if (cesOrderLeaseGoods.getTenantId() == null || cesOrderLeaseGoods.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				cesOrderLeaseGoods.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		cesOrderLeaseGoods.setOrderNo(DateUtils.getCurrentTimestamp() + "");
+		cesOrderLeaseGoods.setCreateDate(new Date());
 		cesOrderLeaseGoodsService.save(cesOrderLeaseGoods);
 		return Result.OK("添加成功！");
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderLeaseGoods.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;
@@ -69,19 +67,22 @@ public class CesOrderLeaseGoods implements Serializable {
     @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")
+	@Excel(name = "归还时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "归还时间")
     private Date revertDate;
 	/**创建时间*/
-	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
 	/**单据号*/
 	@Excel(name = "单据号", width = 15)
     @ApiModelProperty(value = "单据号")
     private String orderNo;
+
+	@TableField(exist = false)
+	private String roomNo;
 }