检查物品是否归还

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

@@ -1,9 +1,6 @@
 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.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -16,6 +13,7 @@ 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 io.swagger.annotations.Info;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
@@ -92,16 +90,30 @@ 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="livingOrderId",required = false) String livingOrderId,
 														   @RequestParam(name="startTime",required = false) String startTime,
 														   @RequestParam(name="endTime",required = false) String endTime,
 								   HttpServletRequest req) {
-		LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, req.getParameterMap()).lambda();
+		Map<String, String[]> map=req.getParameterMap();
+		Map writeAbleMap = new HashMap();
+		writeAbleMap.putAll(map);
+//		writeAbleMap.remove("livingOrderId");
+		LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, writeAbleMap).lambda();
+
 		if (ObjectUtils.isNotEmpty(startTime)) {
 			queryWrapper.ge(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(startTime));
 		}
 		if (ObjectUtils.isNotEmpty(endTime)) {
 			queryWrapper.le(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(endTime));
 		}
+//		if(ObjectUtils.isNotEmpty(livingOrderId)) {
+//			List<String> livingOrderIds = Arrays.asList(livingOrderId.split(","));
+//			queryWrapper.and(i -> {
+//				livingOrderIds.forEach(t -> {
+//					i.or().eq(CesOrderLeaseGoods::getLivingOrderId, t);
+//				});
+//			});
+//		}
 		Page<CesOrderLeaseGoods> page = new Page<CesOrderLeaseGoods>(pageNo, pageSize);
 		IPage<CesOrderLeaseGoods> pageList = cesOrderLeaseGoodsService.page(page, queryWrapper);
 		pageList.getRecords().forEach(item -> {
@@ -118,6 +130,26 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 	}
 
 	 /**
+	  * 检查物品是否归还
+	  * @param livingOrderId
+	  * @return
+	  */
+	 @ApiOperation(value="检查物品是否归还", notes="检查物品是否归还")
+	 @GetMapping(value = "/checkReturnGoods")
+	 public Result<Long> checkReturnGoods(@RequestParam(name="livingOrderId") String livingOrderId) {
+		 List<String> livingOrderIds = Arrays.asList(livingOrderId.split(","));
+		 LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = new LambdaQueryWrapper<>();
+		 queryWrapper.isNull(CesOrderLeaseGoods::getRevertDate);
+		 queryWrapper.and(i -> {
+			 livingOrderIds.forEach(t -> {
+				 i.or().eq(CesOrderLeaseGoods::getLivingOrderId, t);
+			 });
+		 });
+		 Long count = cesOrderLeaseGoodsService.count(queryWrapper);
+		 return Result.OK(count);
+	 }
+
+	 /**
 	  * 归还
 	  * @param dto
 	  * @return