From c63df34f870d70dff9e383a01891458b865346be Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 10:31:01 +0800 Subject: [PATCH] =?UTF-8?q?oem=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/feign/IAttachClient.java | 13 +- .../desk/quality/controller/NgController.java | 318 +++++++++--------- .../quality/service/impl/NgServiceImpl.java | 5 +- .../resource/feign/AttachClient.java | 6 + .../desk/basic/constant/OemConst.java | 44 +++ .../desk/basic/controller/OemController.java | 44 ++- .../desk/basic/mapper/OemMapper.java | 3 + .../desk/basic/pojo/entity/Oem.java | 2 +- .../desk/basic/pojo/request/OemSearch.java | 11 + .../desk/basic/service/IOemService.java | 5 + .../basic/service/impl/OemServiceImpl.java | 11 + .../quality/constant/LiquidTankTaskConst.java | 1 - .../controller/IndicatorYearController.java | 2 +- .../IndicatorYearDetailController.java | 2 +- .../controller/PlanTestController.java | 2 +- 15 files changed, 294 insertions(+), 175 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java index 309d29e8..8070473d 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java @@ -20,6 +20,8 @@ public interface IAttachClient { String DETAIL_BY_ID = API_PREFIX + "/detail-by-id"; + String COPY_FROM_TEMP_TO_BIZ_PREFIX = API_PREFIX + "/copy-from-temp-to-biz-prefix"; + /** * * @param attach @@ -29,10 +31,19 @@ public interface IAttachClient { R detail(@RequestBody Attach attach); /** - * todo:改成get * @param id * @return */ @GetMapping(DETAIL_BY_ID) R detailById(@RequestParam("id") Long id); + + /** + * + * @param id + * @param bizPrefix + * @return + */ + @GetMapping(COPY_FROM_TEMP_TO_BIZ_PREFIX) + R copyFromTempToBizPrefix(@RequestParam("id") Long id, + @RequestParam("bizPrefix") String bizPrefix); } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java index 83fd7c52..bb651df9 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.excel.NgExcel; @@ -35,8 +34,11 @@ 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.Map; import java.util.List; +import java.util.stream.Collectors; + import jakarta.servlet.http.HttpServletResponse; /** @@ -55,184 +57,186 @@ import jakarta.servlet.http.HttpServletResponse; public class NgController extends BladeController { @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.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 = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.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 = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + 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 = NgWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [缺陷] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng 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 = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng 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 = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [缺陷] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") + @Operation(summary = "修改批量", description = "传入Ng List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [缺陷] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng 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 = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng 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 = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[缺陷]数据表", list, NgExcel.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, Ng.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"); + return null; + } + + /** + * [缺陷] 导入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, Ng.class +// ); +// return R.status(service.saveBatch(importList)); + return null; + } } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java index b022af64..4fa1aaa4 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.mapper.NgMapper; import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -34,8 +33,8 @@ import java.util.List; @Slf4j public class NgServiceImpl extends BaseServiceImpl implements INgService { - @Resource - private IUserClient userClient; +// @Resource +// private IUserClient userClient; @Resource private IDictClient dictClient; diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java index 2fdb059c..078bb9a5 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java @@ -30,4 +30,10 @@ public class AttachClient implements IAttachClient { Attach detail = attachService.getById(id); return R.data(detail); } + + @Override + public R copyFromTempToBizPrefix(Long id, String bizPrefix) { + // todo:有temp桶,成功以后移动到具体业务桶中. + return null; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java new file mode 100644 index 00000000..55e07c7d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java @@ -0,0 +1,44 @@ +package org.springblade.desk.basic.constant; + +public interface OemConst { + + /** + * 正常供货 + */ + Integer S_OK = 0; + /** + * 暂停供货 + */ + Integer S_STOP = 1; + /** + * 暂停新物料采购 + */ + Integer S_STOP_NEW_MAT = 2; + + + /** + * 民品&普军 + */ + Integer QUALIFICATION_0 = 0; + /** + * 军标线 + */ + Integer QUALIFICATION_1 = 1; + /** + * 民品&普军&航军 + */ + Integer QUALIFICATION_2 = 2; + /** + * 民品&普军&军标线 + */ + Integer QUALIFICATION_3 = 3; + /** + * 民品&普军&航军&军标线 + */ + Integer QUALIFICATION_4 = 4; + + + + + String DICT_QUALIFICATION = "Oem-Qualification"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 110c701e..8231b870 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -25,8 +25,10 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; import org.springblade.desk.basic.util.ExcelExtUtil; @@ -78,16 +80,40 @@ public class OemController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入Oem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map oem, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); + // 构建search对象。 + OemSearch search = new OemSearch(); + +// if (map.containsKey(Oem.COL_CODE)) { +// search.setCode((Func.toStr(map.get(OemSearch.COL_CODE)))); +// } +// if (map.containsKey(Oem.COL_OC_NAME)) { +// search.setOcName((Func.toStr(map.get(OemSearch.COL_OC_NAME)))); +// } +// if (map.containsKey(Oem.COL_ABBREVIATION)) { +// search.setAbbreviation((Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); +// } +// if (map.containsKey(OemSearch.COL_QUALIFICATION)) { +// search.setQualification((Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); +// } +// if (map.containsKey(BaseCol.STATUS)) { +// search.setStatus((Integer) map.get(BaseCol.STATUS)); +// } +// if (map.containsKey(OemSearch.COL_CONTACT_MAN)) { +// search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); +// } + + +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = OemWrapper.build().pageVO(pages); + +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); + return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 72ae9820..692c3739 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 3546ce73..42f66146 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -112,7 +112,7 @@ public class Oem extends BaseEntity { * 资质 */ @Schema(description = "资质") - private Short qualification; + private Integer qualification; /** * 联系人 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java new file mode 100644 index 00000000..a122effb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java @@ -0,0 +1,11 @@ +package org.springblade.desk.basic.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + +@Data +@EqualsAndHashCode(callSuper = true) +public class OemSearch extends Oem { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index df2ef9b8..71b1c508 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -9,7 +9,10 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; @@ -44,5 +47,7 @@ public interface IOemService extends BaseService { */ void setVOValue(OemVO vo); + IPage listSearch(IPage page, OemSearch search); + R setPassword(Oem updateOne); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 9361d4ea..5fa344e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -5,16 +5,19 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; import org.springblade.system.feign.IDictClient; @@ -60,6 +63,14 @@ public class OemServiceImpl extends BaseServiceImpl implements I } + @Override + public IPage listSearch(IPage page, OemSearch search) { + // todo: + // Wrapper qw = Wrappers.query().lambda(); + // qw.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); // todo: + return null; + } + @Override public R setPassword(Oem updateOne) { Oem find = getById(updateOne.getId()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java index 79f18dd8..4dd2c0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java @@ -9,7 +9,6 @@ public interface LiquidTankTaskConst { * 来源类型-[2]:周期自动生成; */ Integer FROM_TYPE_PERIODIC = 2; - /** * 来源类型-[3]:计算自动生成; */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index f36dad20..1c6b2578 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; /** * [年度指标] 控制器 - * + * mes v1: qc_annual_target * @author Tom Shuo * @since 2025-12-22 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java index ac67fffe..60dec0ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [年度指标明细] 控制器 - * + * mes v1: qc_annual_target_detail * @author Tom Shuo * @since 2025-12-23 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 7054a57b..0a0b798d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [转试记录] 控制器 - * mes v1: + * mes v1: pr_plan_test * @author Tom Shuo * @since 2025-12-24 */