From 8f4bed6bdbe672e85c02988aaa4e970bed53ea7b Mon Sep 17 00:00:00 2001 From: Tom Li Date: Wed, 21 Jan 2026 15:53:52 +0800 Subject: [PATCH] =?UTF-8?q?copyList=20=E6=A7=BD=E6=B6=B2=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=20=E8=AF=A6=E6=83=85=20=E4=BC=9A=E5=B8=A6=E4=B8=80=E4=B8=AAcop?= =?UTF-8?q?yList=E7=9A=84=E5=88=97=E8=A1=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/constant/InspectionTaskConst.java | 6 +- .../quality/pojo/entity/InspectionTask.java | 9 + .../pojo/vo/InspectionTaskDetailVO.java | 6 - .../pojo/vo/LiquidTankReportDetailVO.java | 31 ++ .../quality/pojo/vo/LiquidTankReportVO.java | 9 +- .../LiquidTankReportController.java | 309 +++++++++--------- .../service/ILiquidTankReportService.java | 1 + .../service/ILiquidTankTaskCopyService.java | 2 + .../service/IRelTankReportItemService.java | 32 +- .../impl/InspectionTaskServiceImpl.java | 6 + .../impl/LiquidTankReportServiceImpl.java | 15 +- .../impl/LiquidTankTaskCopyServiceImpl.java | 30 +- .../LiquidTankReportDetailWrapper.java | 37 +++ 13 files changed, 310 insertions(+), 183 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportDetailVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/LiquidTankReportDetailWrapper.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java index b26d920f..d1d76b9b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -6,7 +6,6 @@ public interface InspectionTaskConst { * 热表 */ Integer FROM_TYPE_RB = 1; - /** * 烧结 */ @@ -28,4 +27,9 @@ public interface InspectionTaskConst { * NA */ Integer CHECK_RESULT_NA = 3; + + /** + * 烧结包装防护 + */ + String PROCESS_NAME_SJBZFH = "烧结包装防护"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index 2d3bb05d..bd754e0a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -167,6 +167,10 @@ public class InspectionTask extends BaseEntity { * 接收日期 */ public static final String COL_RECEIVE_DATE = "RECEIVE_DATE"; + /** + * [工序]名称 + */ + public static final String COL_PROCESS_NAME = "PROCESS_NAME"; /** * [检验任务]编码 @@ -343,4 +347,9 @@ public class InspectionTask extends BaseEntity { */ @Schema(description = "接收日期") private LocalDateTime receiveDate; + /** + * 工序名称 + */ + @Schema(description = "工序名称") + private String processName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index ac62b12b..1c281589 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -28,12 +28,6 @@ public class InspectionTaskDetailVO extends InspectionTask { @Serial private static final long serialVersionUID = 1L; - /** - * todo: - */ - @Schema(description = "工序名称") - private String processName = "工序名称A"; - private InspectionTaskListVO orderInfo; private List remindMsgList; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportDetailVO.java new file mode 100644 index 00000000..e92c6602 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportDetailVO.java @@ -0,0 +1,31 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.LiquidTankReport; +import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; + +import java.io.Serial; +import java.util.List; + +/** + * [槽液报告] 视图实体类 + * + * @author Tom Shuo + * @since 2025-12-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankReportDetailVO extends LiquidTankReport { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "维护人") + private String updateUserRealName; + @Schema(description = "复制槽液任务列表") + private List copyList; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java index 997e435e..8dc4b533 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; import java.io.Serial; +import java.util.List; /** * [槽液报告] 视图实体类 @@ -19,9 +20,9 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class LiquidTankReportVO extends LiquidTankReport { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - @Schema(description = "维护人") - private String updateUserRealName; + @Schema(description = "维护人") + private String updateUserRealName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index f4d8d143..92290c42 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -28,8 +28,11 @@ import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; +import org.springblade.desk.quality.pojo.vo.LiquidTankReportDetailVO; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import org.springblade.desk.quality.service.ILiquidTankReportService; +import org.springblade.desk.quality.service.ILiquidTankTaskCopyService; +import org.springblade.desk.quality.wrapper.LiquidTankReportDetailWrapper; import org.springblade.desk.quality.wrapper.LiquidTankReportWrapper; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -54,179 +57,183 @@ import java.util.Map; public class LiquidTankReportController extends BladeController { @Resource - private ILiquidTankReportService service; - - /** - * [槽液报告] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入LiquidTankReport Obj") - public R detail(LiquidTankReport liquidTankReport) { - QueryWrapper qw = Condition.getQueryWrapper(liquidTankReport); - LiquidTankReport detail = service.getOne(qw); - LiquidTankReportVO detailVO = LiquidTankReportWrapper.build().entityVO(detail); - return R.data(detailVO); - } - - /** - * [槽液报告] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入LiquidTankReport Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map liquidTankReport, - Query query) { + private ILiquidTankReportService service; + @Resource + private ILiquidTankTaskCopyService liquidTankTaskCopyService; + + /** + * [槽液报告] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入LiquidTankReport Obj") + public R detail(LiquidTankReport liquidTankReport) { + QueryWrapper qw = Condition.getQueryWrapper(liquidTankReport); + LiquidTankReport detail = service.getOne(qw); + LiquidTankReportDetailVO detailVO = LiquidTankReportDetailWrapper.build().entityVO(detail); + // 直接查询明细列表 + detailVO.setCopyList(liquidTankTaskCopyService.getListByLiquidTankReportId(detailVO.getId())); + return R.data(detailVO); + } + + /** + * [槽液报告] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入LiquidTankReport Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map liquidTankReport, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = LiquidTankReportWrapper.build().pageVO(pages); - return R.data(pagesVO); - } - - - /** - * [槽液报告] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入LiquidTankReport Obj") - public R> page(LiquidTankReportVO liquidTankReport, Query query) { - IPage pagesVO = service.selectLiquidTankReportPage( - Condition.getPage(query), liquidTankReport - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = LiquidTankReportWrapper.build().pageVO(pages); + return R.data(pagesVO); + } + + + /** + * [槽液报告] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入LiquidTankReport Obj") + public R> page(LiquidTankReportVO liquidTankReport, Query query) { + IPage pagesVO = service.selectLiquidTankReportPage( + Condition.getPage(query), liquidTankReport + ); + return R.data(pagesVO); + } + + /** * [槽液报告] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = LiquidTankReportWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = LiquidTankReportWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [槽液报告] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入LiquidTankReport Obj") + public R save(@Valid @RequestBody LiquidTankReport addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [槽液报告] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入LiquidTankReport Obj") - public R save(@Valid @RequestBody LiquidTankReport addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [槽液报告] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入LiquidTankReport List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [槽液报告] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入LiquidTankReport Obj") - public R update(@Valid @RequestBody LiquidTankReport updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入LiquidTankReport List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [槽液报告] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入LiquidTankReport Obj") + public R update(@Valid @RequestBody LiquidTankReport updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [槽液报告] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入LiquidTankReport List") + @Operation(summary = "修改批量", description = "传入LiquidTankReport List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [槽液报告] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入LiquidTankReport Obj") - public R submit(@Valid @RequestBody LiquidTankReport mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [槽液报告] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入LiquidTankReport Obj") + public R submit(@Valid @RequestBody LiquidTankReport mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [槽液报告] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入LiquidTankReport List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [槽液报告] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [槽液报告] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入LiquidTankReport") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map liquidTankReport, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(LiquidTankReport::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(LiquidTankReportEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportLiquidTankReport(qw); - ExcelUtil.export(response, "[槽液报告]数据" + DateUtil.time(), - "[槽液报告]数据表", list, LiquidTankReportExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入LiquidTankReport List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [槽液报告] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [槽液报告] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入LiquidTankReport") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map liquidTankReport, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(LiquidTankReport::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(LiquidTankReportEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportLiquidTankReport(qw); + ExcelUtil.export(response, "[槽液报告]数据" + DateUtil.time(), + "[槽液报告]数据表", list, LiquidTankReportExcel.class); + } + + /** * [槽液报告] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [槽液报告] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, LiquidTankReport.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [槽液报告] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, LiquidTankReport.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java index c6a0ea1a..d1bd5bd3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; +import org.springblade.desk.quality.pojo.vo.LiquidTankReportDetailVO; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java index e3dafa3f..b1de266c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java @@ -45,4 +45,6 @@ public interface ILiquidTankTaskCopyService extends BaseService list); R generateWave(@Valid @RequestBody List list); + + List getListByLiquidTankReportId(Long liquidTankReportId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IRelTankReportItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IRelTankReportItemService.java index 1406a03d..6f17daba 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IRelTankReportItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IRelTankReportItemService.java @@ -19,20 +19,22 @@ import java.util.List; * @since 2025-12-18 */ public interface IRelTankReportItemService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param relTankReportItem 查询参数 - * @return IPage - */ - IPage selectRelTankReportItemPage(IPage page, RelTankReportItemVO relTankReportItem); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportRelTankReportItem(Wrapper queryWrapper); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param relTankReportItem 查询参数 + * @return IPage + */ + IPage selectRelTankReportItemPage(IPage page, + RelTankReportItemVO relTankReportItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRelTankReportItem(Wrapper queryWrapper); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index c9e48175..92db073e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -169,6 +169,12 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl implements ILiquidTankReportService { +public class LiquidTankReportServiceImpl extends BaseServiceImpl + implements ILiquidTankReportService { + + @Resource + private IRelTankReportItemService relTankReportItemService; @Resource private IUserClient userClient; @@ -53,6 +62,8 @@ public class LiquidTankReportServiceImpl extends BaseServiceImpl implements ILiquidTankTaskCopyService { + @Resource + private IWorkCenterService workCenterService; + @Resource private ILiquidTankReportService reportService; @Resource @@ -53,8 +60,7 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl selectLiquidTankTaskCopyPage(IPage page, LiquidTankTaskCopyVO liquidTankTaskCopy) { @@ -103,7 +109,7 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl getListByLiquidTankReportId(Long liquidTankReportId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(RelTankReportItem::getLiquidTankReportId, liquidTankReportId); + List relList = relReportItemService.list(qw); + List copyList = new ArrayList<>(); + for (RelTankReportItem relOne : relList) { + Long taskId = relOne.getLiquidTankTaskId(); + LiquidTankTaskCopy copy = getById(taskId); + LiquidTankTaskCopyVO copyVO = LiquidTankTaskCopyWrapper.build().entityVO(copy); + setVOValue(copyVO); + copyList.add(copyVO); + } + return copyList; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/LiquidTankReportDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/LiquidTankReportDetailWrapper.java new file mode 100644 index 00000000..273bf55b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/LiquidTankReportDetailWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.LiquidTankReport; +import org.springblade.desk.quality.pojo.vo.LiquidTankReportDetailVO; +import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; + +import java.util.Objects; + +/** + * [槽液报告] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-12-18 + */ +public class LiquidTankReportDetailWrapper extends BaseEntityWrapper { + + public static LiquidTankReportDetailWrapper build() { + return new LiquidTankReportDetailWrapper(); + } + + @Override + public LiquidTankReportDetailVO entityVO(LiquidTankReport liquidTankReport) { + LiquidTankReportDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(liquidTankReport, LiquidTankReportDetailVO.class)); + + //User createUser = UserCache.getUser(liquidTankReport.getCreateUser()); + //User updateUser = UserCache.getUser(liquidTankReport.getUpdateUser()); + //liquidTankReportVO.setCreateUserName(createUser.getName()); + //liquidTankReportVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +}