change(dms): 润滑工单实例相关功能完善

- 在 DmsBillsLubeInstance 中添加主键自增类型
- 更新 DmsBillsLubeInstanceActivityBo 和 DmsBillsLubeInstanceActivityVo 的映射配置
- 修改 DmsBillsLubeInstanceActivityController 中的添加和编辑方法返回值类型
- 更新 DmsBillsLubeInstanceVo 的映射配置
- 修改 DmsPlanLubeMapper.xml 中的 SQL 查询

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<Void> add(@Validated(AddGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) {
-        return toAjax(dmsBillsLubeInstanceActivityService.insertByBo(bo));
+    public R<DmsBillsLubeInstanceActivityVo> 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<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) {
-        return toAjax(dmsBillsLubeInstanceActivityService.updateByBo(bo));
+    public R<DmsBillsLubeInstanceActivityVo> edit(@Validated(EditGroup.class) @RequestBody DmsBillsLubeInstanceActivityBo bo) {
+        return R.ok(dmsBillsLubeInstanceActivityService.updateByBo(bo));
     }
 
     /**

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;
 
     /**

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 {
 
     /**

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

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

ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml

@@ -45,9 +45,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="sub_update_time"    />
     </resultMap>
 
+<!--    <select id="selectDmsPlanLubeJoinByPlanLubeCode" parameterType="String" resultMap="DmsPlanLubeDmsPlanLubeDetailResult">-->
+<!--        select a.plan_lube_id, a.plan_lube_code, a.lube_level, a.lube_group, a.lube_supervisor, a.lube_time, a.time_limit, a.job_id, a.cycle_period, a.create_method, a.active_flag, a.remark, a.create_by, a.create_time, a.update_by,-->
+<!--               a.update_time-->
+<!--        from dms_plan_lube a-->
+<!--        where a.plan_lube_code = #{planLubeCode}-->
+<!--    </select>-->
+
     <select id="selectDmsPlanLubeJoinByPlanLubeCode" parameterType="String" resultMap="DmsPlanLubeDmsPlanLubeDetailResult">
         select a.plan_lube_id, a.plan_lube_code, a.lube_level, a.lube_group, a.lube_supervisor, a.lube_time, a.time_limit, a.job_id, a.cycle_period, a.create_method, a.active_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time,
-/*               b.plan_lube_detail_id as sub_plan_lube_detail_id,
+               b.plan_lube_detail_id as sub_plan_lube_detail_id,
                b.plan_lube_id as sub_plan_lube_id,
                b.device_id as sub_machine_id,
                b.lube_station_id as sub_lube_station_id,
@@ -58,9 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                b.create_by as sub_create_by,
                b.create_time as sub_create_time,
                b.update_by as sub_update_by,
-               b.update_time as sub_update_time*/
+               b.update_time as sub_update_time
         from dms_plan_lube a
-/*                 left join dms_plan_lube_detail b on b.plan_lube_id = a.plan_lube_id*/
+                 left join dms_plan_lube_detail b on b.plan_lube_id = a.plan_lube_id
         where a.plan_lube_code = #{planLubeCode}
     </select>