From 4a1d5d28bb51bddf0dc798f7398b2305ea6bfbad Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 21 May 2025 11:16:46 +0800 Subject: [PATCH] =?UTF-8?q?change(dms):=20=E6=B6=A6=E6=BB=91=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=AE=9E=E4=BE=8B=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DmsBillsLubeInstance 中添加主键自增类型 - 更新 DmsBillsLubeInstanceActivityBo 和 DmsBillsLubeInstanceActivityVo 的映射配置 - 修改 DmsBillsLubeInstanceActivityController 中的添加和编辑方法返回值类型 - 更新 DmsBillsLubeInstanceVo 的映射配置 - 修改 DmsPlanLubeMapper.xml 中的 SQL 查询 --- .../DmsBillsLubeInstanceActivityController.java | 13 +++++++++---- .../dromara/dms/domain/DmsBillsLubeInstance.java | 2 +- .../domain/bo/DmsBillsLubeInstanceActivityBo.java | 2 +- .../domain/vo/DmsBillsLubeInstanceActivityVo.java | 2 +- .../dms/domain/vo/DmsBillsLubeInstanceVo.java | 2 +- .../main/resources/mapper/dms/DmsPlanLubeMapper.xml | 13 ++++++++++--- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsLubeInstanceActivityController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsLubeInstanceActivityController.java index bdd611dd..b7454a70 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsLubeInstanceActivityController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsLubeInstanceActivityController.java @@ -77,8 +77,13 @@ public class DmsBillsLubeInstanceActivityController extends BaseController { @Log(title = "润滑工单实例节点", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) { - return toAjax(dmsBillsLubeInstanceActivityService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) { + DmsBillsLubeInstanceActivityVo savedActivity = dmsBillsLubeInstanceActivityService.insertByBo(bo); + if (savedActivity != null && savedActivity.getInstanceActivityId() != null) { + return R.ok(savedActivity); + } else { + return R.fail("创建润滑工单活动记录失败"); + } } /** @@ -88,8 +93,8 @@ public class DmsBillsLubeInstanceActivityController extends BaseController { @Log(title = "润滑工单实例节点", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) { - return toAjax(dmsBillsLubeInstanceActivityService.updateByBo(bo)); + public R edit(@Validated(EditGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) { + return R.ok(dmsBillsLubeInstanceActivityService.updateByBo(bo)); } /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsLubeInstance.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsLubeInstance.java index 560931b6..caf89681 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsLubeInstance.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsLubeInstance.java @@ -31,7 +31,7 @@ public class DmsBillsLubeInstance extends TenantEntity { /** * 主键标识 */ - @TableId(value = "lube_instance_id") + @TableId(value = "lube_instance_id", type = IdType.AUTO) private Long lubeInstanceId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsLubeInstanceActivityBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsLubeInstanceActivityBo.java index e291d612..c3fe8623 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsLubeInstanceActivityBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsLubeInstanceActivityBo.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = DmsBillsLubeInstanceActivity.class, reverseConvertGenerate = false) +@AutoMapper(target = DmsBillsLubeInstanceActivity.class, reverseConvertGenerate = true) public class DmsBillsLubeInstanceActivityBo extends BaseEntity { /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceActivityVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceActivityVo.java index 3bde736a..0f216d14 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceActivityVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceActivityVo.java @@ -24,7 +24,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = DmsBillsLubeInstanceActivity.class) +@AutoMapper(target = DmsBillsLubeInstanceActivity.class, reverseConvertGenerate = true) public class DmsBillsLubeInstanceActivityVo implements Serializable { @Serial diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceVo.java index dd1490c3..aa51094e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceVo.java @@ -25,7 +25,7 @@ import java.util.List; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = DmsBillsLubeInstance.class) +@AutoMapper(target = DmsBillsLubeInstance.class, reverseConvertGenerate = true) public class DmsBillsLubeInstanceVo implements Serializable { @Serial diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml index 4039037b..324cf029 100644 --- a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml @@ -45,9 +45,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + +