From 0d2ae5c1cb2988361d540829deab2e3414f48b27 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Sat, 21 Mar 2026 17:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=E5=AD=90?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DsPartRelationController.java | 24 ++++++++++++++++++ .../resources/Excel/QA/实验项目管理.xls | Bin 0 -> 7168 bytes 2 files changed, 24 insertions(+) create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/实验项目管理.xls diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.java index a26e6583..8ca1e3fa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.java @@ -38,6 +38,8 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.dashboard.service.IDsPartService; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -50,6 +52,8 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; + +import java.util.ArrayList; import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -68,6 +72,8 @@ public class DsPartRelationController extends BladeController { private final IDsPartRelationService dsPartRelationService; + private final IDsPartService dsPartService; + /** * 部件-子件关联表 详情 */ @@ -100,6 +106,24 @@ public class DsPartRelationController extends BladeController { return R.data(pages); } + @GetMapping("/getSubParts") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入dsPartRelation") + public R> getSubParts(String partCode) { + List pages = new ArrayList<>(); + + QueryWrapper relationQuery = new QueryWrapper<>(); + relationQuery.eq("part_code", partCode); + List list = dsPartRelationService.list(relationQuery); + if(null != list && list.size() > 0){ + List childPartIds = list.stream().map(DsPartRelationEntity::getChildPartId).toList(); + QueryWrapper partQuery = new QueryWrapper<>(); + partQuery.in("id", childPartIds); + pages = dsPartService.list(partQuery); + } + return R.data(pages); + } + /** * 部件-子件关联表 新增 */ diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/实验项目管理.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/实验项目管理.xls new file mode 100644 index 0000000000000000000000000000000000000000..7b7932e98f52eb351d5c7a50eb493cbcfb76b8a0 GIT binary patch literal 7168 zcmeHLYiv|S6h8Ov-F6oW-99LV%DNUxpFkf}3I%qHt-**CDGGr#&{7@^3Z_8-Wv5EX0I~r3nYc@Ljs+IWCj2%_Kw4xYc(-hWr-x4km@&3B7!Lv- zrXoEml?OG`>8dfM?`5AjYq(I1H1yBi80aJjfz%-y5r~w$0>cFQ1^}zix zSp)b?U>48_%m(HFtRDmq0ZqU>-~pf+XaW9DG0y9O7c<=Q$*9wry&+^VAHDhINtMn~ zvk`M~d2XMU>*o4((<>Cl?(mvmvp){3!G0Zgqasx#r|8;nB#-eofo#cFLy83sr+)(EQj*z77 z%za(i;SVj1%c~sZ6L-D+b zTk-rzW^|Q7?{3FzDdL9`cFs0gkGQ-Br?wg;KhKY+BzdipPvK!INnR%hJcR(|nm7YV zJag^B$?S3bdJPXCvU|FTm__YJ3=2D=VI9HlsK3R>B7htC4dP4fGL|aOb%Z5G-_BhJ zw(a|IODx;I?)QbruIpH^BXj*{k4EvC=aCEe?xRY6^68_2@9NP2+mVbkdC1emE|#GF zZVYpj+D@~OcH(Hrtu;q=(1&+kKK%1nk8~^wu2k|0C9hQJ3rZ3}9h*w%1Zgmy$CF;m zK2W}>YQLn?$yaM%2$m+~%dX}Jg5?SMLok&Wy}I}l%|fGz9Cfe2zdvYmLmtBuk36f! zE^;i3W3W`2t@e+MmrXob5PL2rkHXsU+RPqP2NM^@pdV$+6=h9*G?rM&V8BHM{mev( zJ^L0Wo~xS8HFM=SeJUZKlNrzi*w)1}5LL1xF4ulG^mcgir6X=d71^3l%h`>IF;Bbk z&Tyga5}HesGNsCfkS3W@SI~|Uxob+jD(uy8OHHXwuY(MNSM~w351~ZgIsKV^T$Z0X zQCGk(T6m`?_ErCHbJa(Cb_~fa=~tC6W;1wtxpcAoLc1D z`#Strb?HbmWbPDM7=xkRX-_cO0e~WVkgy;70KV%jfIgs)=}Y>U_H*ObV-tGEJ1BnM zZ@$6%s0O^9_f9t9mDeS1aRcn^O(I)2`AvG|4ZY@e*8eF+$~(MM0O#^I0G6MMXI$%C z^IYo#0M|MX>MCl%e_Y$1*xd7h-^kjv-JiOC>~i8-wq@7j>R63F+59!+ITlhGK%HS0 zus%AGu)j|Nlrztm^DyRrE7oo|Rz)XP#cHgGdEi~B*@-jw8ayGT8!OjfEv{JVkxr2Y V+*8&7)j%C`Gu2(BYWyEc{sI@7Firpf literal 0 HcmV?d00001