diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java new file mode 100644 index 00000000..e1188f94 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java @@ -0,0 +1,57 @@ +package org.springblade.desk.basic.constant; + +/** + * mes v1: copy from IFlowBusinessBean + */ +public interface FlowConst { + + /** + * 初始状态(未发送审批) + */ + public static final short STATUS_NEW = -1; + + /** + * 审批中(审批中) + */ + public static final short STATUS_CHECKING = 0; + + /** + * 审批完毕(审批通过) + */ + public static final short STATUS_CHECKED = 1; + + /** + * 变更待审中 + */ + public static final short STATUS_CHANGE_WAITING_FOR_CHECKUP = 2; + + /** + * 变更中 + */ + public static final short STATUS_CHANGING = 3; + + /** + * 打回 + */ + public static final short STATUS_RETURN = 4; + + /** + * 审批未通过 + */ + public static final short STATUS_UNPASS = 10; + + /** + * 已完成 + */ + public static final short STATUS_COMPLETE = 20; + + /** + * 已作废 + */ + public static final short STATUS_CANCEL = 21; + + /** + * 已变更 + */ + public static final short STATUS_CHANGE_OK = 22; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java index c46d35be..50043f69 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.BatConfigExcel; import org.springblade.desk.basic.pojo.entity.BatConfig; import org.springblade.desk.basic.pojo.vo.BatConfigVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/BA/BatConfig") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/BatConfig") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class BatConfigController extends BladeController { @Resource - private IBatConfigService service; - - /** - * [批量配置] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入BatConfig Obj") - public R detail(BatConfig batConfig) { - QueryWrapper qw = Condition.getQueryWrapper(batConfig); - BatConfig detail = service.getOne(qw); - BatConfigVO detailVO = BatConfigWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [批量配置] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入BatConfig Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map batConfig, - Query query) { + private IBatConfigService service; + + /** + * [批量配置] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入BatConfig Obj") + public R detail(BatConfig batConfig) { + QueryWrapper qw = Condition.getQueryWrapper(batConfig); + BatConfig detail = service.getOne(qw); + BatConfigVO detailVO = BatConfigWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [批量配置] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入BatConfig Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map batConfig, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = BatConfigWrapper.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 = "传入BatConfig Obj") - public R> page(BatConfigVO batConfig, Query query) { - IPage pagesVO = service.selectBatConfigPage( - Condition.getPage(query), batConfig - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = BatConfigWrapper.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 = "传入BatConfig Obj") + public R> page(BatConfigVO batConfig, Query query) { + IPage pagesVO = service.selectBatConfigPage( + Condition.getPage(query), batConfig + ); + 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 = BatConfigWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = BatConfigWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [批量配置] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入BatConfig Obj") + public R save(@Valid @RequestBody BatConfig addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [批量配置] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入BatConfig Obj") - public R save(@Valid @RequestBody BatConfig addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [批量配置] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入BatConfig 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 = "传入BatConfig Obj") - public R update(@Valid @RequestBody BatConfig updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入BatConfig 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 = "传入BatConfig Obj") + public R update(@Valid @RequestBody BatConfig updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [批量配置] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入BatConfig List") + @Operation(summary = "修改批量", description = "传入BatConfig List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [批量配置] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入BatConfig Obj") - public R submit(@Valid @RequestBody BatConfig mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [批量配置] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入BatConfig Obj") + public R submit(@Valid @RequestBody BatConfig mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [批量配置] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入BatConfig 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 = "传入BatConfig") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map batConfig, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(BatConfig::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(BatConfigEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportBatConfig(qw); - ExcelUtil.export(response, "[批量配置]数据" + DateUtil.time(), - "[批量配置]数据表", list, BatConfigExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入BatConfig 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 = "传入BatConfig") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map batConfig, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BatConfig::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BatConfigEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportBatConfig(qw); + ExcelUtil.export(response, "[批量配置]数据" + DateUtil.time(), + "[批量配置]数据表", list, BatConfigExcel.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, BatConfig.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, BatConfig.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index b37783b4..1422781a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.FormulaExcel; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/Formula") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Formula") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -98,7 +99,7 @@ public class FormulaController extends BladeController { */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect( @Parameter(description = "formulaType", required = true) @RequestParam Integer formulaType) { List list = service.list( 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 bc1c113c..f2885e00 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 @@ -3,50 +3,51 @@ */ package org.springblade.desk.basic.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.http.ResponseEntity; -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.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; -import org.springblade.desk.basic.wrapper.OemWrapper; import org.springblade.desk.basic.service.IOemService; -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 org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.OemWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.stream.Collectors; /** * [外协厂家] 控制器 + * mes v1: bs_oem_customer * * @author Tom Shuo * @since 2026-01-04 */ @RestController -@RequestMapping("/Oem") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Oem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -55,184 +56,184 @@ import jakarta.servlet.http.HttpServletResponse; public class OemController extends BladeController { @Resource - private IOemService service; - - /** - * [外协厂家] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Oem Obj") - public R detail(Oem oem) { - QueryWrapper qw = Condition.getQueryWrapper(oem); - Oem detail = service.getOne(qw); - OemVO detailVO = OemWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [外协厂家] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Oem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map oem, - Query query) { + private IOemService service; + + /** + * [外协厂家] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Oem Obj") + public R detail(Oem oem) { + QueryWrapper qw = Condition.getQueryWrapper(oem); + Oem detail = service.getOne(qw); + OemVO detailVO = OemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协厂家] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Oem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map oem, + 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); - } - - - /** - * [外协厂家] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Oem Obj") - public R> page(OemVO oem, Query query) { - IPage pagesVO = service.selectOemPage( - Condition.getPage(query), oem - ); - return R.data(pagesVO); - } - - /** + 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); + } + + + /** + * [外协厂家] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Oem Obj") + public R> page(OemVO oem, Query query) { + IPage pagesVO = service.selectOemPage( + Condition.getPage(query), oem + ); + 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 = OemWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = OemWrapper.build().listVO(list); + return R.data(listVO); } - /** - * [外协厂家] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Oem Obj") - public R save(@Valid @RequestBody Oem addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** + * [外协厂家] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Oem Obj") + public R save(@Valid @RequestBody Oem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** * [外协厂家] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Oem 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 = "传入Oem Obj") - public R update(@Valid @RequestBody Oem updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Oem 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 = "传入Oem Obj") + public R update(@Valid @RequestBody Oem updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [外协厂家] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Oem List") + @Operation(summary = "修改批量", description = "传入Oem List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [外协厂家] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Oem Obj") - public R submit(@Valid @RequestBody Oem mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [外协厂家] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Oem Obj") + public R submit(@Valid @RequestBody Oem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [外协厂家] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Oem 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 = "传入Oem") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportOem(qw); - ExcelUtil.export(response, "[外协厂家]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[外协厂家]数据表", list, OemExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Oem 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 = "传入Oem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportOem(qw); + ExcelUtil.export(response, "[外协厂家]数据" + DateUtil.time(), + "[外协厂家]数据表", list, OemExcel.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, Oem.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, Oem.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java index 6280713f..e8d9d8aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.ProcessAbilityExcel; import org.springblade.desk.basic.pojo.entity.ProcessAbility; import org.springblade.desk.basic.pojo.vo.ProcessAbilityVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/ProcessAbility") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProcessAbility") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class ProcessAbilityController extends BladeController { @Resource - private IProcessAbilityService service; - - /** - * [工艺能力] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ProcessAbility Obj") - public R detail(ProcessAbility processAbility) { - QueryWrapper qw = Condition.getQueryWrapper(processAbility); - ProcessAbility detail = service.getOne(qw); - ProcessAbilityVO detailVO = ProcessAbilityWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [工艺能力] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ProcessAbility Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map processAbility, - Query query) { + private IProcessAbilityService service; + + /** + * [工艺能力] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ProcessAbility Obj") + public R detail(ProcessAbility processAbility) { + QueryWrapper qw = Condition.getQueryWrapper(processAbility); + ProcessAbility detail = service.getOne(qw); + ProcessAbilityVO detailVO = ProcessAbilityWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工艺能力] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ProcessAbility Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map processAbility, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ProcessAbilityWrapper.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 = "传入ProcessAbility Obj") - public R> page(ProcessAbilityVO processAbility, Query query) { - IPage pagesVO = service.selectProcessAbilityPage( - Condition.getPage(query), processAbility - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ProcessAbilityWrapper.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 = "传入ProcessAbility Obj") + public R> page(ProcessAbilityVO processAbility, Query query) { + IPage pagesVO = service.selectProcessAbilityPage( + Condition.getPage(query), processAbility + ); + 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 = ProcessAbilityWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ProcessAbilityWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工艺能力] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ProcessAbility Obj") + public R save(@Valid @RequestBody ProcessAbility addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [工艺能力] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ProcessAbility Obj") - public R save(@Valid @RequestBody ProcessAbility addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [工艺能力] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ProcessAbility 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 = "传入ProcessAbility Obj") - public R update(@Valid @RequestBody ProcessAbility updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ProcessAbility 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 = "传入ProcessAbility Obj") + public R update(@Valid @RequestBody ProcessAbility updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [工艺能力] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ProcessAbility List") + @Operation(summary = "修改批量", description = "传入ProcessAbility List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [工艺能力] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ProcessAbility Obj") - public R submit(@Valid @RequestBody ProcessAbility mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [工艺能力] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ProcessAbility Obj") + public R submit(@Valid @RequestBody ProcessAbility mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [工艺能力] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ProcessAbility 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 = "传入ProcessAbility") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map processAbility, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ProcessAbility::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ProcessAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportProcessAbility(qw); - ExcelUtil.export(response, "[工艺能力]数据" + DateUtil.time(), - "[工艺能力]数据表", list, ProcessAbilityExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ProcessAbility 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 = "传入ProcessAbility") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map processAbility, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ProcessAbility::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ProcessAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportProcessAbility(qw); + ExcelUtil.export(response, "[工艺能力]数据" + DateUtil.time(), + "[工艺能力]数据表", list, ProcessAbilityExcel.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, ProcessAbility.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, ProcessAbility.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index 60d7b5fd..7b8be809 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.ProdMarkExcel; import org.springblade.desk.basic.pojo.entity.ProdMark; import org.springblade.desk.basic.pojo.vo.ProdMarkVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/BA/ProdMark") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProdMark") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class ProdMarkController extends BladeController { @Resource - private IProdMarkService service; - - /** - * [生产标识] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ProdMark Obj") - public R detail(ProdMark prodMark) { - QueryWrapper qw = Condition.getQueryWrapper(prodMark); - ProdMark detail = service.getOne(qw); - ProdMarkVO detailVO = ProdMarkWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [生产标识] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ProdMark Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map prodMark, - Query query) { + private IProdMarkService service; + + /** + * [生产标识] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ProdMark Obj") + public R detail(ProdMark prodMark) { + QueryWrapper qw = Condition.getQueryWrapper(prodMark); + ProdMark detail = service.getOne(qw); + ProdMarkVO detailVO = ProdMarkWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产标识] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ProdMark Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map prodMark, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ProdMarkWrapper.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 = "传入ProdMark Obj") - public R> page(ProdMarkVO prodMark, Query query) { - IPage pagesVO = service.selectProdMarkPage( - Condition.getPage(query), prodMark - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ProdMarkWrapper.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 = "传入ProdMark Obj") + public R> page(ProdMarkVO prodMark, Query query) { + IPage pagesVO = service.selectProdMarkPage( + Condition.getPage(query), prodMark + ); + 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 = ProdMarkWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ProdMarkWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产标识] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ProdMark Obj") + public R save(@Valid @RequestBody ProdMark addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [生产标识] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ProdMark Obj") - public R save(@Valid @RequestBody ProdMark addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [生产标识] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ProdMark 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 = "传入ProdMark Obj") - public R update(@Valid @RequestBody ProdMark updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ProdMark 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 = "传入ProdMark Obj") + public R update(@Valid @RequestBody ProdMark updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [生产标识] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ProdMark List") + @Operation(summary = "修改批量", description = "传入ProdMark List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [生产标识] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ProdMark Obj") - public R submit(@Valid @RequestBody ProdMark mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [生产标识] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ProdMark Obj") + public R submit(@Valid @RequestBody ProdMark mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [生产标识] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ProdMark 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 = "传入ProdMark") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map prodMark, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ProdMark::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ProdMarkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportProdMark(qw); - ExcelUtil.export(response, "[生产标识]数据" + DateUtil.time(), - "[生产标识]数据表", list, ProdMarkExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ProdMark 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 = "传入ProdMark") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map prodMark, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ProdMark::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ProdMarkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportProdMark(qw); + ExcelUtil.export(response, "[生产标识]数据" + DateUtil.time(), + "[生产标识]数据表", list, ProdMarkExcel.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, ProdMark.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, ProdMark.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index 8ce777c0..a1aa3505 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.TeamSetExcel; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/TeamSet") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TeamSet") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java index b2b912e8..191696c5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.service.TestPowerJobService; import org.springblade.desk.quality.service.CycleTestTaskService2; import org.springblade.desk.quality.service.TestService; @@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; @RestController -@RequestMapping("/BA/TestPowerJob") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TestPowerJob") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 38f99e47..4256df39 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.WorkCenterExcel; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/WorkCenter") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkCenter") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index c3bdd619..0a9fab13 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.excel.WorkTankExcel; import org.springblade.desk.basic.pojo.entity.WorkTank; import org.springblade.desk.basic.pojo.vo.WorkTankVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/WorkTank") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -99,7 +100,7 @@ public class WorkTankController extends BladeController { */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect(@Parameter(hidden = true) @RequestParam Map workTank) { QueryWrapper qw = Condition.getQueryWrapper(workTank, WorkTank.class); List list = service.list(qw); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java index df17ee99..e52f7fc1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java @@ -4,15 +4,14 @@ package org.springblade.desk.basic.excel; -import lombok.Data; - -import java.io.Serializable; -import org.springblade.core.mp.base.BaseEntity; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + import java.io.Serial; +import java.io.Serializable; /** 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 3a3892f4..72ae9820 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 @@ -3,13 +3,14 @@ */ package org.springblade.desk.basic.mapper; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.vo.OemVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java index 4a346a40..9782f5cd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.basic.pojo.dto; -import org.springblade.desk.basic.pojo.entity.Oem; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + import java.io.Serial; /** 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 7ec9e2d5..3546ce73 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 @@ -3,11 +3,12 @@ */ package org.springblade.desk.basic.pojo.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import org.springblade.core.mp.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java index a5f19f3a..b3c1408f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.basic.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Oem; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + import java.io.Serial; /** 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 6d951030..22bfb08c 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 @@ -4,11 +4,12 @@ package org.springblade.desk.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.List; /** 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 3bcc0bca..40cc9d5e 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 @@ -3,22 +3,23 @@ */ package org.springblade.desk.basic.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.core.mp.base.BaseServiceImpl; 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.vo.OemVO; import org.springblade.desk.basic.service.IOemService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java index 0c047145..cadccfeb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.Objects; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java index 86bc68d7..9857b2da 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java @@ -1,6 +1,6 @@ package org.springblade.desk.quality.constant; -public class InspectionTemplateConst { +public interface InspectionTemplateConst { String DICT_CATEGORY = ""; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index af509792..e5f7cd36 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; /** * [工艺文件] 控制器 - * mes v1: + * mes v1: ds_audit_file * * @author Tom Shuo * @since 2025-12-22 @@ -81,12 +81,18 @@ public class AuditFileController extends BladeController { @Operation(summary = "list分页", description = "传入AuditFile Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); + // QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); AuditFileSearch search = new AuditFileSearch(); // todo: Func 用法 - search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); - search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); - search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + if (map.containsKey(AuditFile.COL_PPS_ID)) { + search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); + } + if (map.containsKey(AuditFile.COL_PQ_ID)) { + search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); + } + if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) { + search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + } IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java index ba275361..8e8d86fa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [过程记录模板] 控制器 + * mes v1: ds_rb_file_preserve * * @author Tom Shuo * @since 2025-12-22 @@ -122,9 +123,9 @@ public class ProReTemplateController extends BladeController { @ApiOperationSupport(order = 30) @Operation(summary = "新增一条", description = "传入ProReTemplate Obj") public R save(@Valid @RequestBody ProReTemplate addOne) { - addOne.setId(null); addOne.setStatus(ProReTemplateConst.STATUS_NEW); - addOne.setApprovalStatus(1); + addOne.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1); + addOne.setId(null); return R.status(service.save(addOne)); } @@ -136,6 +137,8 @@ public class ProReTemplateController extends BladeController { @Operation(summary = "新增批量", description = "传入ProReTemplate List") public R saveBat(@Valid @RequestBody List addList) { addList.forEach(one -> { + one.setStatus(ProReTemplateConst.STATUS_NEW); + one.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1); one.setId(null); }); return R.status(service.saveBatch(addList)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index b481eb05..06fb0f6c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -29,16 +29,16 @@