From 5d5c0008766e1fa8171c358a0be0583aaa223138 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Tue, 23 Jun 2026 11:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E4=BF=A1=E6=81=AF=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E4=B8=8B=E5=8F=91=E3=80=81=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/pojo/vo/NoticeVO.java | 15 +++++++++------ .../desk/notice/mapper/NoticeMapper.xml | 5 ++++- .../controller/LiquidTankTaskController.java | 15 +++++++++++++++ .../service/ILiquidTankTaskService.java | 2 ++ .../impl/LiquidTankTaskServiceImpl.java | 19 ++++++++++++++++++- 5 files changed, 48 insertions(+), 8 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java index 4f3bdb23c..2396c3bba 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java @@ -14,13 +14,16 @@ import org.springblade.desk.pojo.entity.Notice; @EqualsAndHashCode(callSuper = true) public class NoticeVO extends Notice { - @Schema(description = "通知类型名") - private String categoryName; + @Schema(description = "通知类型名") + private String categoryName; - @Schema(description = "租户编号") - private String tenantId; + @Schema(description = "租户编号") + private String tenantId; - @Schema(description = "创建人") - private String createUserName; + @Schema(description = "创建人") + private String createUserName; + + @Schema(description = "创建部门") + private String createDeptName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml index 006a47f79..ae5a791ee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml @@ -29,6 +29,7 @@ + SELECT n.*, - bu.REAL_NAME as create_user_name + bu.REAL_NAME as create_user_name, + dept.dept_name as create_dept_name FROM blade_notice n LEFT JOIN blade_user bu on n.create_user = bu.id + LEFT JOIN BLADE_DEPT dept ON n.create_dept = dept.id ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java index d47aa7227..7362b9192 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java @@ -351,6 +351,21 @@ public class LiquidTankTaskController extends BladeController { return service.generateManual(liquidTankId, testUserId); } + /** + * [槽液检测任务] + * + * @param liquidTankIds + * @param testUserId + * @return + */ + @ApiOperationSupport(order = 101) + @PostMapping("/bulkGenerateManual") + @Operation(summary = "手动生成", description = "") + public R bulkGenerateManual(@Parameter(description = "槽液id", required = true) @RequestParam List liquidTankIds, + @Parameter(description = "化验员id", required = true) @RequestParam Long testUserId) { + return service.bulkGenerateManual(liquidTankIds, testUserId); + } + /** * [槽液检测任务] * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java index 143f78bc6..52cf9ae53 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java @@ -40,6 +40,8 @@ public interface ILiquidTankTaskService extends BaseService { R generateManual(Long liquidTankId, Long testUserId); + R bulkGenerateManual(List liquidTankIds, Long testUserId); + R issueBat(String ids, Long testUserId); R accept(Long id); 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 8007ef85c..183a2b1ab 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 @@ -135,6 +135,23 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl liquidTankIds, Long testUserId) { + boolean result = true; + for (Long liquidTankId : liquidTankIds) { + LiquidTank lt = liquidTankService.getById(liquidTankId); + LiquidTankTask task = buildLiquidTankTask(lt, LiquidTankTaskConst.FROM_TYPE_MANUAL, testUserId); + boolean isSuccess = basicSave(task); + if (!isSuccess) { + result = false; + break; + } + } + + return R.status(result); + } + @Override public R issueBat(String ids, Long testUserId) { List list = Func.toLongList(ids); @@ -220,7 +237,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl