From 586428453c4d16a691d8f806594dd72219d0ac65 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 14 Nov 2025 14:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=A2=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=B1=BB=E3=80=82=20=E6=81=A2=E5=A4=8DLiquid?= =?UTF-8?q?TankTaskService=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/test/CodeGeneratorVer2.java | 4 +- blade-ops/blade-job/pom.xml | 4 + .../quality/pojo/entity/LiquidTankTask.java | 434 +++++++++--------- .../controller/InspectionTaskController.java | 34 +- .../desk/quality/controller/NgController.java | 2 +- .../desk/quality/excel/gen/NgGenExcel.java | 2 +- .../mapper/gen/InspectionTaskGenMapper.java | 41 ++ .../mapper/gen/InspectionTaskGenMapper.xml | 38 ++ .../mapper/gen/LiquidTankTaskGenMapper.java | 41 ++ .../mapper/gen/LiquidTankTaskGenMapper.xml | 60 +++ .../desk/quality/mapper/gen/NgGenMapper.java | 41 ++ .../desk/quality/mapper/gen/NgGenMapper.xml | 28 ++ .../pojo/dto/gen/InspectionTaskGenDTO.java | 24 + .../pojo/dto/gen/LiquidTankTaskGenDTO.java | 24 + .../desk/quality/pojo/dto/gen/NgGenDTO.java | 24 + .../quality/pojo/entity/InspectionTask.java | 137 ++++++ .../quality/pojo/entity/LiquidTankTask.java | 247 ++++++++++ .../desk/quality/pojo/entity/Ng.java | 86 ++++ .../pojo/vo/gen/InspectionTaskGenVO.java | 24 + .../pojo/vo/gen/LiquidTankTaskGenVO.java | 24 + .../desk/quality/pojo/vo/gen/NgGenVO.java | 24 + .../service/LiquidTankTaskService.java | 58 +++ .../gen/IInspectionTaskGenService.java | 39 ++ .../quality/service/gen/INgGenService.java | 2 +- .../service/impl/gen/NgGenServiceImpl.java | 2 +- .../LiquidTankTaskScheduledService.java | 10 - .../quality/wrapper/gen/NgGenWrapper.java | 2 +- 27 files changed, 1198 insertions(+), 258 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java diff --git a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java index 0719bbf..04be11b 100644 --- a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java @@ -41,7 +41,7 @@ public class CodeGeneratorVer2 { /** * 代码生成的模块名 */ - public static String CODE_NAME = "[槽液]"; + public static String CODE_NAME = "[检验任务]"; /** * 代码所在服务名 */ @@ -57,7 +57,7 @@ public class CodeGeneratorVer2 { /** * 需要生成的表名(两者只能取其一) */ - public static String[] INCLUDE_TABLES = {"QA_LIQUID_TANK"}; + public static String[] INCLUDE_TABLES = {"QA_INSPECTION_TASK"}; /** * 需要排除的表名(两者只能取其一) */ diff --git a/blade-ops/blade-job/pom.xml b/blade-ops/blade-job/pom.xml index bfae16c..1d19e22 100644 --- a/blade-ops/blade-job/pom.xml +++ b/blade-ops/blade-job/pom.xml @@ -35,6 +35,10 @@ org.springblade blade-starter-powerjob + + org.springblade + blade-desk-api + diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java index 2a1f27f..37c8fb8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java @@ -24,223 +24,223 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class LiquidTankTask extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * [槽液检测任务]编码 - */ - @Schema(description = "[槽液检测任务]编码") - private String code; - /** - * 类型 - */ - @Schema(description = "类型") - private Long liquidTankTaskType; - /** - * 名称 - */ - @Schema(description = "名称") - private String name; - /** - * [槽液]id - */ - @Schema(description = "[槽液]id") - private Long liquidTankId; - /** - * [作业中心]id - */ - @Schema(description = "[作业中心]id") - private Long workCenterId; - /** - * 药品[物料]id - */ - @Schema(description = "药品[物料]id") - private Long drugMaterialId; - /** - * [槽液]编号 - */ - @Schema(description = "[槽液]编号") - private String liquidTankCode; - /** - * 待测成分 - */ - @Schema(description = "待测成分") - private String testElement; - /** - * 药品名称 - */ - @Schema(description = "药品名称") - private String drugName; - /** - * 药品[物料]编码 - */ - @Schema(description = "药品[物料]编码") - private String drugMaterialCode; - /** - * 药品物料名称 - */ - @Schema(description = "药品物料名称") - private String drugMaterialName; - /** - * 工艺含量 - */ - @Schema(description = "工艺含量") - private String processContent; - /** - * 目标值 - */ - @Schema(description = "目标值") - private BigDecimal targetValue; - /** - * 目标上下限 - */ - @Schema(description = "目标上下限") - private String bound; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 添加点 - */ - @Schema(description = "添加点") - private BigDecimal fillingLocation; - /** - * 电导率测量值 - */ - @Schema(description = "电导率测量值") - private BigDecimal conductivityTestValue; - /** - * 体积 - */ - @Schema(description = "体积") - private BigDecimal volume; - /** - * 单位 - */ - @Schema(description = "单位") - private BigDecimal unit; - /** - * [计量单位]id - */ - @Schema(description = "[计量单位]id") - private BigDecimal unitId; - /** - * 加药量单位 - */ - @Schema(description = "加药量单位") - private String addUnit; - /** - * 加药量[计量单位]id - */ - @Schema(description = "加药量[计量单位]id") - private BigDecimal addUnitId; - /** - * 分析周期 - */ - @Schema(description = "分析周期") - private Integer analysisCycle; - /** - * 有效期 - */ - @Schema(description = "有效期") - private LocalDateTime validDate; - /** - * 上次化验日期 - */ - @Schema(description = "上次化验日期") - private LocalDateTime lastTest; - /** - * 槽液到期日期 - */ - @Schema(description = "槽液到期日期") - private LocalDateTime expiryDate; - /** - * 化验人[用户]id - */ - @Schema(description = "化验人[用户]id") - private BigDecimal testUserId; - /** - * 工艺主管[用户]id - */ - @Schema(description = "工艺主管[用户]id") - private BigDecimal processUserId; - /** - * 测量值 - */ - @Schema(description = "测量值") - private BigDecimal testValue; - /** - * 需添加量 - */ - @Schema(description = "需添加量") - private BigDecimal needAddValue; - /** - * 实际添加量 - */ - @Schema(description = "实际添加量") - private BigDecimal actualAddValue; - /** - * 加药后含量 - */ - @Schema(description = "加药后含量") - private BigDecimal afterAddValue; - /** - * [班组]id - */ - @Schema(description = "[班组]id") - private BigDecimal teamId; - /** - * 参数录入时间 - */ - @Schema(description = "参数录入时间") - private LocalDateTime entryDate; - /** - * 确认时间 - */ - @Schema(description = "确认时间") - private LocalDateTime confirmDate; - /** - * 送出[用户]id - */ - @Schema(description = "送出[用户]id") - private BigDecimal sendUserId; - /** - * 送出时间 - */ - @Schema(description = "送出时间") - private LocalDateTime sendDate; - /** - * 接收[用户]id - */ - @Schema(description = "接收[用户]id") - private BigDecimal receiveUserId; - /** - * 接收时间 - */ - @Schema(description = "接收时间") - private LocalDateTime receiveDate; - /** - * 处理[用户]id - */ - @Schema(description = "处理[用户]id") - private BigDecimal handleUserId; - /** - * 处理时间 - */ - @Schema(description = "处理时间") - private LocalDateTime handleDate; - /** - * 来源类型 - */ - @Schema(description = "来源类型") - private Integer fromType; + /** + * [槽液检测任务]编码 + */ + @Schema(description = "[槽液检测任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long liquidTankTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [槽液]id + */ + @Schema(description = "[槽液]id") + private Long liquidTankId; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long workCenterId; + /** + * 药品[物料]id + */ + @Schema(description = "药品[物料]id") + private Long drugMaterialId; + /** + * [槽液]编号 + */ + @Schema(description = "[槽液]编号") + private String liquidTankCode; + /** + * 待测成分 + */ + @Schema(description = "待测成分") + private String testElement; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 药品[物料]编码 + */ + @Schema(description = "药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @Schema(description = "药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @Schema(description = "工艺含量") + private String processContent; + /** + * 目标值 + */ + @Schema(description = "目标值") + private Long targetValue; + /** + * 目标上下限 + */ + @Schema(description = "目标上下限") + private String bound; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 添加点 + */ + @Schema(description = "添加点") + private BigDecimal fillingLocation; + /** + * 电导率测量值 + */ + @Schema(description = "电导率测量值") + private BigDecimal conductivityTestValue; + /** + * 体积 + */ + @Schema(description = "体积") + private BigDecimal volume; + /** + * 单位 + */ + @Schema(description = "单位") + private BigDecimal unit; + /** + * [计量单位]id + */ + @Schema(description = "[计量单位]id") + private BigDecimal unitId; + /** + * 加药量单位 + */ + @Schema(description = "加药量单位") + private String addUnit; + /** + * 加药量[计量单位]id + */ + @Schema(description = "加药量[计量单位]id") + private BigDecimal addUnitId; + /** + * 分析周期 + */ + @Schema(description = "分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @Schema(description = "有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @Schema(description = "上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @Schema(description = "槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @Schema(description = "化验人[用户]id") + private BigDecimal testUserId; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 测量值 + */ + @Schema(description = "测量值") + private BigDecimal testValue; + /** + * 需添加量 + */ + @Schema(description = "需添加量") + private BigDecimal needAddValue; + /** + * 实际添加量 + */ + @Schema(description = "实际添加量") + private BigDecimal actualAddValue; + /** + * 加药后含量 + */ + @Schema(description = "加药后含量") + private BigDecimal afterAddValue; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private Long teamId; + /** + * 参数录入时间 + */ + @Schema(description = "参数录入时间") + private LocalDateTime entryDate; + /** + * 确认时间 + */ + @Schema(description = "确认时间") + private LocalDateTime confirmDate; + /** + * 送出[用户]id + */ + @Schema(description = "送出[用户]id") + private Long sendUserId; + /** + * 送出时间 + */ + @Schema(description = "送出时间") + private LocalDateTime sendDate; + /** + * 接收[用户]id + */ + @Schema(description = "接收[用户]id") + private Long receiveUserId; + /** + * 接收时间 + */ + @Schema(description = "接收时间") + private LocalDateTime receiveDate; + /** + * 处理[用户]id + */ + @Schema(description = "处理[用户]id") + private BigDecimal handleUserId; + /** + * 处理时间 + */ + @Schema(description = "处理时间") + private LocalDateTime handleDate; + /** + * 来源类型 + */ + @Schema(description = "来源类型") + private Long fromType; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index c120ca5..02f1fe6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -9,7 +9,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @@ -24,9 +23,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.quality.excel.gen.InspectionTaskGenExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.request.InspectionTaskStart; import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; -import org.springblade.desk.quality.service.InspectionTaskService; import org.springblade.desk.quality.service.gen.IInspectionTaskGenService; import org.springblade.desk.quality.wrapper.gen.InspectionTaskGenWrapper; import org.springframework.web.bind.annotation.*; @@ -41,14 +38,12 @@ import java.util.Map; * @since 2025-11-14 */ @RestController +@AllArgsConstructor @RequestMapping("/inspectionTask") @Tag(name = "[检验任务]", description = "[检验任务]接口") public class InspectionTaskController extends BladeController { - @Resource - private IInspectionTaskGenService genService; - @Resource - private InspectionTaskService service; + private final IInspectionTaskGenService inspectionTaskGenService; /** * [检验任务] 详情 @@ -57,7 +52,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") public R detail(InspectionTask inspectionTask) { - InspectionTask detail = genService.getOne(Condition.getQueryWrapper(inspectionTask)); + InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); return R.data(InspectionTaskGenWrapper.build().entityVO(detail)); } @@ -68,7 +63,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { - IPage pages = genService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); + IPage pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); return R.data(InspectionTaskGenWrapper.build().pageVO(pages)); } @@ -80,7 +75,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入inspectionTask") public R> page(InspectionTaskGenVO inspectionTask, Query query) { - IPage pages = genService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); + IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); return R.data(pages); } @@ -91,7 +86,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入inspectionTask") public R save(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(genService.save(inspectionTask)); + return R.status(inspectionTaskGenService.save(inspectionTask)); } /** @@ -101,7 +96,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入inspectionTask") public R update(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(genService.updateById(inspectionTask)); + return R.status(inspectionTaskGenService.updateById(inspectionTask)); } /** @@ -111,7 +106,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 6) @Operation(summary = "新增或修改", description = "传入inspectionTask") public R submit(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(genService.saveOrUpdate(inspectionTask)); + return R.status(inspectionTaskGenService.saveOrUpdate(inspectionTask)); } /** @@ -121,7 +116,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 7) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(genService.deleteLogic(Func.toLongList(ids))); + return R.status(inspectionTaskGenService.deleteLogic(Func.toLongList(ids))); } /** @@ -137,17 +132,8 @@ public class InspectionTaskController extends BladeController { // queryWrapper.lambda().eq(InspectionTask::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(InspectionTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = genService.exportInspectionTask(queryWrapper); + List list = inspectionTaskGenService.exportInspectionTask(queryWrapper); ExcelUtil.export(response, "[检验任务]数据" + DateUtil.time(), "[检验任务]数据表", list, InspectionTaskGenExcel.class); } - /** - * 工序开始，[检验任务]生成 - */ - @PostMapping("/start") - @ApiOperationSupport(order = 100) - @Operation(summary = "", description = "传入inspectionTask") - public R start(@Valid @RequestBody InspectionTaskStart start) { - return service.start(start); - } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 528f206..ab803e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -35,7 +35,7 @@ import java.util.Map; * [缺陷] 控制器 * * @author Tom Shuo - * @since 2025-11-13 + * @since 2025-11-14 */ @RestController @AllArgsConstructor diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java index afb3e47..268c89a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/NgGenExcel.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; * [缺陷] Excel实体类 * * @author Tom Shuo - * @since 2025-11-13 + * @since 2025-11-14 */ @Data @ColumnWidth(25) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java new file mode 100644 index 0000000..d95a808 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +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.quality.excel.gen.InspectionTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; + +import java.util.List; + +/** + * [检验任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface InspectionTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return List + */ + List selectInspectionTaskPage(IPage page, InspectionTaskGenVO inspectionTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml new file mode 100644 index 0000000..80f37c4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/InspectionTaskGenMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java new file mode 100644 index 0000000..f8559bb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +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.quality.excel.gen.LiquidTankTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.pojo.vo.gen.LiquidTankTaskGenVO; + +import java.util.List; + +/** + * [槽液检测任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface LiquidTankTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param liquidTankTask 查询参数 + * @return List + */ + List selectLiquidTankTaskPage(IPage page, LiquidTankTaskGenVO liquidTankTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLiquidTankTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml new file mode 100644 index 0000000..a04aa4b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/LiquidTankTaskGenMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java new file mode 100644 index 0000000..72722d6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +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.quality.excel.gen.NgGenExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.gen.NgGenVO; + +import java.util.List; + +/** + * [缺陷] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface NgGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return List + */ + List selectNgPage(IPage page, NgGenVO ng); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml new file mode 100644 index 0000000..d73a1a0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/NgGenMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java new file mode 100644 index 0000000..d29e33f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/InspectionTaskGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; + +/** + * [检验任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskGenDTO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java new file mode 100644 index 0000000..7655963 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/LiquidTankTaskGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; + +import java.io.Serial; + +/** + * [槽液检测任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTaskGenDTO extends LiquidTankTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java new file mode 100644 index 0000000..c1f6a34 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/NgGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + +import java.io.Serial; + +/** + * [缺陷] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgGenDTO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java new file mode 100644 index 0000000..07b5078 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -0,0 +1,137 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [检验任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_INSPECTION_TASK") +@Schema(description = "InspectionTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class InspectionTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [检验任务]编码 + */ + @Schema(description = "[检验任务]编码") + private String code; + /** + * [检验任务]类型 + */ + @Schema(description = "[检验任务]类型") + private Long inspectionTaskType; + /** + * [检验任务] + */ + @Schema(description = "[检验任务]") + private String name; + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private BigDecimal workOrderId; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * 质检员[用户]id + */ + @Schema(description = "质检员[用户]id") + private BigDecimal testUserId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private Long productCode; + /** + * [制品]序列号 + */ + @Schema(description = "[制品]序列号") + private Long productSn; + /** + * 生产批次号 + */ + @Schema(description = "生产批次号") + private Long batchNumber; + /** + * [工单]编码 + */ + @Schema(description = "[工单]编码") + private String workOrderCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 计划开始时间 + */ + @Schema(description = "计划开始时间") + private LocalDateTime plannedStartDate; + /** + * 计划结束时间 + */ + @Schema(description = "计划结束时间") + private LocalDateTime plannedEndDate; + /** + * 实际开始时间 + */ + @Schema(description = "实际开始时间") + private LocalDateTime actualStartDate; + /** + * 实际结束时间 + */ + @Schema(description = "实际结束时间") + private LocalDateTime actualEndDate; + /** + * 检验样本数量 + */ + @Schema(description = "检验样本数量") + private BigDecimal simpleCount; + /** + * 缺陷数量 + */ + @Schema(description = "缺陷数量") + private BigDecimal ngCount; + /** + * 检验结果 + */ + @Schema(description = "检验结果") + private Long result; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java new file mode 100644 index 0000000..8cf5ec5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java @@ -0,0 +1,247 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [槽液检测任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_LIQUID_TANK_TASK") +@Schema(description = "LiquidTankTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [槽液检测任务]编码 + */ + @Schema(description = "[槽液检测任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long liquidTankTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [槽液]id + */ + @Schema(description = "[槽液]id") + private Long liquidTankId; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long workCenterId; + /** + * 药品[物料]id + */ + @Schema(description = "药品[物料]id") + private Long drugMaterialId; + /** + * [槽液]编号 + */ + @Schema(description = "[槽液]编号") + private String liquidTankCode; + /** + * 待测成分 + */ + @Schema(description = "待测成分") + private String testElement; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 药品[物料]编码 + */ + @Schema(description = "药品[物料]编码") + private String drugMaterialCode; + /** + * 药品物料名称 + */ + @Schema(description = "药品物料名称") + private String drugMaterialName; + /** + * 工艺含量 + */ + @Schema(description = "工艺含量") + private String processContent; + /** + * 目标值 + */ + @Schema(description = "目标值") + private Long targetValue; + /** + * 目标上下限 + */ + @Schema(description = "目标上下限") + private String bound; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 添加点 + */ + @Schema(description = "添加点") + private BigDecimal fillingLocation; + /** + * 电导率测量值 + */ + @Schema(description = "电导率测量值") + private BigDecimal conductivityTestValue; + /** + * 体积 + */ + @Schema(description = "体积") + private BigDecimal volume; + /** + * 单位 + */ + @Schema(description = "单位") + private BigDecimal unit; + /** + * [计量单位]id + */ + @Schema(description = "[计量单位]id") + private BigDecimal unitId; + /** + * 加药量单位 + */ + @Schema(description = "加药量单位") + private String addUnit; + /** + * 加药量[计量单位]id + */ + @Schema(description = "加药量[计量单位]id") + private BigDecimal addUnitId; + /** + * 分析周期 + */ + @Schema(description = "分析周期") + private Integer analysisCycle; + /** + * 有效期 + */ + @Schema(description = "有效期") + private LocalDateTime validDate; + /** + * 上次化验日期 + */ + @Schema(description = "上次化验日期") + private LocalDateTime lastTest; + /** + * 槽液到期日期 + */ + @Schema(description = "槽液到期日期") + private LocalDateTime expiryDate; + /** + * 化验人[用户]id + */ + @Schema(description = "化验人[用户]id") + private BigDecimal testUserId; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 测量值 + */ + @Schema(description = "测量值") + private BigDecimal testValue; + /** + * 需添加量 + */ + @Schema(description = "需添加量") + private BigDecimal needAddValue; + /** + * 实际添加量 + */ + @Schema(description = "实际添加量") + private BigDecimal actualAddValue; + /** + * 加药后含量 + */ + @Schema(description = "加药后含量") + private BigDecimal afterAddValue; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private Long teamId; + /** + * 参数录入时间 + */ + @Schema(description = "参数录入时间") + private LocalDateTime entryDate; + /** + * 确认时间 + */ + @Schema(description = "确认时间") + private LocalDateTime confirmDate; + /** + * 送出[用户]id + */ + @Schema(description = "送出[用户]id") + private Long sendUserId; + /** + * 送出时间 + */ + @Schema(description = "送出时间") + private LocalDateTime sendDate; + /** + * 接收[用户]id + */ + @Schema(description = "接收[用户]id") + private Long receiveUserId; + /** + * 接收时间 + */ + @Schema(description = "接收时间") + private LocalDateTime receiveDate; + /** + * 处理[用户]id + */ + @Schema(description = "处理[用户]id") + private BigDecimal handleUserId; + /** + * 处理时间 + */ + @Schema(description = "处理时间") + private LocalDateTime handleDate; + /** + * 来源类型 + */ + @Schema(description = "来源类型") + private Long fromType; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java new file mode 100644 index 0000000..2b04b98 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -0,0 +1,86 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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; +import java.math.BigDecimal; + +/** + * [缺陷] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_NG") +@Schema(description = "Ng Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Ng extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型1:故障特征 2:故障类别 3:问题大类 4:问题小类 + */ + @Schema(description = "类型1:故障特征 2:故障类别 3:问题大类 4:问题小类") + private Long ngType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 缺陷描述 + */ + @Schema(description = "缺陷描述") + private String desc; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java new file mode 100644 index 0000000..f7d24d3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/InspectionTaskGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; + +/** + * [检验任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskGenVO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java new file mode 100644 index 0000000..2831584 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/LiquidTankTaskGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; + +import java.io.Serial; + +/** + * [槽液检测任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LiquidTankTaskGenVO extends LiquidTankTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java new file mode 100644 index 0000000..de718c6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/NgGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + +import java.io.Serial; + +/** + * [缺陷] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgGenVO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java new file mode 100644 index 0000000..38a5b5f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java @@ -0,0 +1,58 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.flowable.task.service.delegate.TaskListener; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.constant.ColValue; +import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; +import org.springblade.desk.quality.mapper.gen.LiquidTankTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.LiquidTank; +import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +@Data +public class LiquidTankTaskService { + + @Resource + private LiquidTankGenMapper liquidTankGenMapper; + @Resource + private LiquidTankTaskGenMapper genMapper; + + public List generate() { + // 如果是节假日，则跳过生成。 + if (false) { + log.info("节假日，则跳过生成。"); + return null; + } + // 查询所有启用的槽液。 + List tankList = liquidTankGenMapper.selectList( + new QueryWrapper() + .eq(ColBase.STATUS, ColValue.STATE_ENABLE) + ); + // 遍历插入槽液任务。 + List rList = new ArrayList<>(); + for (LiquidTank tank : tankList) { + LiquidTankTask task = new LiquidTankTask(); + task.setLiquidTankId(tank.getId()); + task.setName("name"); + task.setCode("code"); + task.setSort(0L); + task.setCreateTime(new Date()); + task.setRemark("remark"); + task.setTeamId(0L); + task.setReceiveUserId(0L); + genMapper.insert(task); + rList.add(task); + } + return rList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java new file mode 100644 index 0000000..54acdce --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IInspectionTaskGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.InspectionTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.gen.InspectionTaskGenVO; + +import java.util.List; + +/** + * [检验任务] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface IInspectionTaskGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return IPage + */ + IPage selectInspectionTaskPage(IPage page, InspectionTaskGenVO inspectionTask); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java index eeec785..dc23d49 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/INgGenService.java @@ -16,7 +16,7 @@ import java.util.List; * [缺陷] 服务类 * * @author Tom Shuo - * @since 2025-11-13 + * @since 2025-11-14 */ public interface INgGenService extends BaseService { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java index 745fd13..345fcbb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/NgGenServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * [缺陷] 服务实现类 * * @author Tom Shuo - * @since 2025-11-13 + * @since 2025-11-14 */ @Service public class NgGenServiceImpl extends BaseServiceImpl implements INgGenService { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java index dc31f31..0aa7ea2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java @@ -5,18 +5,8 @@ package org.springblade.desk.quality.service.scheduled; //import tech.powerjob.worker.core.processor.TaskContext; //import tech.powerjob.worker.log.OmsLogger; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import jakarta.annotation.Resource; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.constant.ColBase; -import org.springblade.desk.quality.constant.ColValue; -import org.springblade.desk.quality.constant.LiquidTankTaskConst; -import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; -import org.springblade.desk.quality.mapper.gen.LiquidTankTaskGenMapper; -import org.springblade.desk.quality.pojo.entity.LiquidTank; -import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springframework.stereotype.Service; import java.util.Date; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java index 9bd9858..8e161bf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/NgGenWrapper.java @@ -14,7 +14,7 @@ import java.util.Objects; * [缺陷] 包装类,返回视图层所需的字段 * * @author Tom Shuo - * @since 2025-11-13 + * @since 2025-11-14 */ public class NgGenWrapper extends BaseEntityWrapper {