From 67ac8bf46e9b6a96cbb4f24ac531194d0b9d6b33 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 26 Jan 2026 11:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=80=E7=A7=8D=E5=B0=8F=E7=B1=BB=20?= =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E4=BB=BB=E5=8A=A1=20=E5=8C=96=E9=AA=8C?= =?UTF-8?q?=E9=A2=91=E7=8E=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/pojo/entity/PlatingSmall.java | 2 +- .../desk/basic/pojo/vo/PlatingSmallVO.java | 3 + .../quality/pojo/entity/LiquidTankTask.java | 5 + .../controller/PlatingSmallController.java | 314 +++++++++--------- .../service/impl/PlatingSmallServiceImpl.java | 44 ++- .../LiquidTankReportConfigServiceImpl.java | 55 +-- .../impl/LiquidTankTaskServiceImpl.java | 9 + 7 files changed, 233 insertions(+), 199 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java index 58aee23b..d9085399 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java @@ -57,7 +57,7 @@ public class PlatingSmall extends BaseEntity { * 日常规生产能力 */ @Schema(description = "日常规生产能力") - private BigDecimal capacity; + private Integer capacity; /** * [作业中心]id */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java index 617337d7..ab9e9bb4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.basic.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.basic.pojo.entity.PlatingSmall; @@ -21,4 +22,6 @@ public class PlatingSmallVO extends PlatingSmall { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "[作业中心]name") + private String wcName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java index 2335fbd5..3c4301a2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java @@ -523,4 +523,9 @@ public class LiquidTankTask extends BaseEntity { */ @Schema(description = "超期标记") private Integer flagOut; + /** + * 化验频率 + */ + @Schema(description = "化验频率") + private String jobExtShowText; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java index 265bb16d..c236470a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java @@ -56,184 +56,186 @@ import java.util.stream.Collectors; public class PlatingSmallController extends BladeController { @Resource - private IPlatingSmallService service; - - /** - * [镀种小类] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入PlatingSmall Obj") - public R detail(PlatingSmall platingSmall) { - QueryWrapper qw = Condition.getQueryWrapper(platingSmall); - PlatingSmall detail = service.getOne(qw); - PlatingSmallVO detailVO = PlatingSmallWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [镀种小类] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入PlatingSmall Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map platingSmall, - Query query) { + private IPlatingSmallService service; + + /** + * [镀种小类] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入PlatingSmall Obj") + public R detail(PlatingSmall platingSmall) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall); + PlatingSmall detail = service.getOne(qw); + PlatingSmallVO detailVO = PlatingSmallWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种小类] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入PlatingSmall Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map platingSmall, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = PlatingSmallWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [镀种小类] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入PlatingSmall Obj") - public R> page(PlatingSmallVO platingSmall, Query query) { - IPage pagesVO = service.selectPlatingSmallPage( - Condition.getPage(query), platingSmall - ); - return R.data(pagesVO); - } - - /** + // 名称 + qw.like(PlatingSmall.COL_BPS_NAME, Func.toStr(platingSmall.get("bpsName"))); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingSmallWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种小类] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入PlatingSmall Obj") + public R> page(PlatingSmallVO platingSmall, Query query) { + IPage pagesVO = service.selectPlatingSmallPage( + Condition.getPage(query), platingSmall + ); + 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 = PlatingSmallWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = PlatingSmallWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种小类] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入PlatingSmall Obj") + public R save(@Valid @RequestBody PlatingSmall addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [镀种小类] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入PlatingSmall Obj") - public R save(@Valid @RequestBody PlatingSmall addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [镀种小类] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入PlatingSmall 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 = "传入PlatingSmall Obj") - public R update(@Valid @RequestBody PlatingSmall updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入PlatingSmall 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 = "传入PlatingSmall Obj") + public R update(@Valid @RequestBody PlatingSmall updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [镀种小类] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入PlatingSmall List") + @Operation(summary = "修改批量", description = "传入PlatingSmall List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [镀种小类] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入PlatingSmall Obj") - public R submit(@Valid @RequestBody PlatingSmall mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [镀种小类] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入PlatingSmall Obj") + public R submit(@Valid @RequestBody PlatingSmall mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [镀种小类] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入PlatingSmall 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 = "传入PlatingSmall") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map platingSmall, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(PlatingSmall::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(PlatingSmallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportPlatingSmall(qw); - ExcelUtil.export(response, "[镀种小类]数据" + DateUtil.time(), - "[镀种小类]数据表", list, PlatingSmallExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入PlatingSmall 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 = "传入PlatingSmall") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map platingSmall, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(PlatingSmall::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingSmallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlatingSmall(qw); + ExcelUtil.export(response, "[镀种小类]数据" + DateUtil.time(), + "[镀种小类]数据表", list, PlatingSmallExcel.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, PlatingSmall.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, PlatingSmall.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java index 0df8ee85..3701848a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java @@ -12,10 +12,14 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.feign.IWorkCenterClient; import org.springblade.desk.basic.mapper.PlatingSmallMapper; import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; import org.springblade.desk.basic.service.IPlatingSmallService; +import org.springblade.desk.basic.service.IWorkCenterService; +import org.springblade.desk.basic.util.IdUtil; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; @@ -40,22 +44,30 @@ public class PlatingSmallServiceImpl extends BaseServiceImpl selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall) { - return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall)); - } - - @Override - public List exportPlatingSmall(Wrapper queryWrapper) { - List platingSmallList = baseMapper.exportPlatingSmall(queryWrapper); - //platingSmallList.forEach(platingSmall -> { - // platingSmall.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingSmall.getType())); - //}); - return platingSmallList; - } - - @Override - public void setVOValue(PlatingSmallVO vo) { + @Resource + private IWorkCenterService workCenterService; + + @Override + public IPage selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall) { + return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall)); + } + @Override + public List exportPlatingSmall(Wrapper queryWrapper) { + List platingSmallList = baseMapper.exportPlatingSmall(queryWrapper); + //platingSmallList.forEach(platingSmall -> { + // platingSmall.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingSmall.getType())); + //}); + return platingSmallList; + } + + @Override + public void setVOValue(PlatingSmallVO vo) { + if (IdUtil.isValid(vo.getId())) { + WorkCenter wc = workCenterService.getById(vo.getId()); + if (wc != null) { + vo.setWcName(wc.getWcName()); + } + } } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankReportConfigServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankReportConfigServiceImpl.java index 8dd2bf3e..6e2538fd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankReportConfigServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankReportConfigServiceImpl.java @@ -33,35 +33,38 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Slf4j public class LiquidTankReportConfigServiceImpl extends BaseServiceImpl - implements ILiquidTankReportConfigService { + implements ILiquidTankReportConfigService { - @Override - public IPage selectLiquidTankReportConfigPage(IPage page, - LiquidTankReportConfigVO liquidTankReportConfig) { - return page.setRecords(baseMapper.selectLiquidTankReportConfigPage(page, liquidTankReportConfig)); - } + @Override + public IPage selectLiquidTankReportConfigPage(IPage page, + LiquidTankReportConfigVO liquidTankReportConfig) { + return page.setRecords(baseMapper.selectLiquidTankReportConfigPage(page, liquidTankReportConfig)); + } - @Override - public List exportLiquidTankReportConfig(Wrapper queryWrapper) { - List liquidTankReportConfigList = baseMapper.exportLiquidTankReportConfig(queryWrapper); - //liquidTankReportConfigList.forEach(liquidTankReportConfig -> { - // liquidTankReportConfig.setTypeName(DictCache.getValue(DictEnum.YES_NO, LiquidTankReportConfig.getType())); - //}); - return liquidTankReportConfigList; - } + @Override + public List exportLiquidTankReportConfig(Wrapper queryWrapper) { + List liquidTankReportConfigList = baseMapper.exportLiquidTankReportConfig(queryWrapper); + //liquidTankReportConfigList.forEach(liquidTankReportConfig -> { + // liquidTankReportConfig.setTypeName(DictCache.getValue(DictEnum.YES_NO, LiquidTankReportConfig.getType())); + //}); + return liquidTankReportConfigList; + } - @Override - public void setVOValue(LiquidTankReportConfigVO vo) { + @Override + public void setVOValue(LiquidTankReportConfigVO vo) { - } + } - @Override - public LiquidTankReportConfigVO getByWcId(Long wcId) { - LiquidTankReportConfig one = getOne( - new QueryWrapper().eq(LiquidTankReportConfig.COL_WC_ID,wcId) - ); - LiquidTankReportConfigVO vo = new LiquidTankReportConfigVO(); - BeanUtil.copyProperties(one,vo,true); - return vo; - } + @Override + public LiquidTankReportConfigVO getByWcId(Long wcId) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq(LiquidTankReportConfig.COL_WC_ID, wcId); + LiquidTankReportConfig one = getOne(qw); + if (one == null) { + return null; + } + LiquidTankReportConfigVO vo = new LiquidTankReportConfigVO(); + BeanUtil.copyProperties(one, vo, true); + return vo; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java index 2aa3425b..dabd5c3c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java @@ -31,9 +31,11 @@ import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskHi; +import org.springblade.desk.quality.pojo.request.JobExt; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; import org.springblade.desk.quality.service.*; import org.springblade.desk.basic.util.IdUtil; +import org.springblade.desk.quality.util.JobExtUtil; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; @@ -391,6 +393,13 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl