租借物品關聯商品

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

@@ -8,6 +8,7 @@ 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;
 
@@ -31,10 +32,12 @@ 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.BusDictItem;
 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.IBusDictItemService;
 import org.jeecg.modules.business.service.IBusHotelService;
 import org.jeecg.modules.order.entity.CesOrderLeaseGoods;
 import org.jeecg.modules.order.service.ICesOrderLeaseGoodsService;
@@ -72,6 +75,8 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 	private ICesOrderLeaseGoodsService cesOrderLeaseGoodsService;
 	 @Autowired
 	 private CesRoomsServiceImpl cesRoomsService;
+	 @Resource
+	 private IBusDictItemService busDictItemService;
 	/**
 	 * 分页列表查询
 	 *
@@ -104,6 +109,10 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 			if (rooms != null) {
 				item.setRoomNo(rooms.getName());
 			}
+			BusDictItem busDictItem = busDictItemService.getById(item.getGoodsId());
+			if (busDictItem != null) {
+				item.setGoodName(busDictItem.getItemText());
+			}
 		});
 		return Result.OK(pageList);
 	}
@@ -123,7 +132,7 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 		 cesOrderLeaseGoodsService.update(updateWrapper);
 		 return Result.OK("编辑成功!");
 	 }
-	
+
 	/**
 	 *   添加
 	 *
@@ -148,7 +157,7 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 		cesOrderLeaseGoodsService.save(cesOrderLeaseGoods);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -163,7 +172,7 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 		cesOrderLeaseGoodsService.updateById(cesOrderLeaseGoods);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -178,7 +187,7 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 		cesOrderLeaseGoodsService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -193,7 +202,7 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 		this.cesOrderLeaseGoodsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderLeaseGoods.java

@@ -89,4 +89,7 @@ public class CesOrderLeaseGoods implements Serializable {
 
 	@TableField(exist = false)
 	private String roomNo;
+
+	@TableField(exist = false)
+	private String goodName;
 }