合并子表查询到主表获取详情接口中。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java

@@ -1,41 +0,0 @@
-package com.win.module.wms.controller.purchaseclaimRequest;
-
-import com.win.framework.common.pojo.CommonResult;
-import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO;
-import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert;
-import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
-import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestDetailService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.win.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 采购索赔申请子")
-@RestController
-@RequestMapping("/wms/purchaseclaim-request-detail")
-@Validated
-public class PurchaseclaimRequestDetailController {
-
-    @Resource
-    private PurchaseclaimRequestDetailService purchaseclaimRequestDetailService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得采购索赔申请子列表")
-    @Parameter(name = "masterId", description = "主表id", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:query')")
-    public CommonResult<List<PurchaseclaimRequestDetailRespVO>> getPurchaseclaimRequestDetailList(@RequestParam("masterId") Long masterId) {
-        List<PurchaseclaimRequestDetailDO> list = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(masterId);
-        return success(PurchaseclaimRequestDetailConvert.INSTANCE.convertList(list));
-    }
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java

@@ -8,8 +8,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.purchaseclaimRequest.vo.*;
+import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert;
 import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestMainConvert;
+import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
 import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO;
+import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestDetailService;
 import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class PurchaseclaimRequestMainController {
     @Resource
     private PurchaseclaimRequestMainService purchaseclaimRequestMainService;
 
+    @Resource
+    private PurchaseclaimRequestDetailService purchaseclaimRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -70,7 +76,10 @@ public class PurchaseclaimRequestMainController {
     @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:query')")
     public CommonResult<PurchaseclaimRequestMainRespVO> getPurchaseclaimRequestMain(@RequestParam("id") Long id) {
         PurchaseclaimRequestMainDO purchaseclaimRequestMain = purchaseclaimRequestMainService.getPurchaseclaimRequestMain(id);
-        return success(PurchaseclaimRequestMainConvert.INSTANCE.convert(purchaseclaimRequestMain));
+        PurchaseclaimRequestMainRespVO vo = PurchaseclaimRequestMainConvert.INSTANCE.convert(purchaseclaimRequestMain);
+        List<PurchaseclaimRequestDetailDO> subList = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(vo.getId());
+        vo.setSubList(PurchaseclaimRequestDetailConvert.INSTANCE.convertList(subList));
+        return success(vo);
     }
 
     @GetMapping("/list")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java

@@ -5,10 +5,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 采购索赔申请主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class PurchaseclaimRequestMainRespVO extends PurchaseclaimRequestMainBaseVO {
 
+    @Schema(description = "子表数据")
+    private List<PurchaseclaimRequestDetailRespVO> subList;
+
 }