Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Settlement.java

@@ -25,6 +25,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -196,6 +197,8 @@ public class Settlement  implements Serializable {
 	@ApiModelProperty(value = "租户id")
 	private String tenantId;
 
+	@TableField(exist = false)
+	private List<Items> itemsList;
 
 
 }

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -16,8 +16,11 @@
  */
 package com.trade.finance.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.trade.finance.dto.SettlementDTO;
+import com.trade.finance.entity.Items;
 import com.trade.finance.entity.Settlement;
+import com.trade.finance.service.IItemsService;
 import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
 import io.swagger.annotations.Api;
@@ -35,6 +38,8 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  * 结算表 控制器
  *
@@ -49,6 +54,8 @@ public class SettlementController extends BladeController {
 
 	private final ISettlementService settlementService;
 
+	private final IItemsService itemsService;
+
 	/**
 	 * 详情
 	 */
@@ -57,6 +64,10 @@ public class SettlementController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入settlement")
 	public R<Settlement> detail(Settlement settlement) {
 		Settlement detail = settlementService.getOne(Condition.getQueryWrapper(settlement));
+		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemsLambdaQueryWrapper.eq(Items::getPid,detail.getId());
+		List<Items> list = itemsService.list(itemsLambdaQueryWrapper);
+		detail.setItemsList(list);
 		return R.data(detail);
 	}