update(dms): 为润滑和点巡检工单添加流程状态字段

- 在 DmsBillsInspectInstance 和 DmsBillsLubeInstance 模型中添加 status 字段
- 更新相关 BO 和 VO 类以包含流程状态信息
- 修改控制器和服务层方法，支持流程状态的传递和返回
- 优化插入和更新操作，返回完整的工单实例信息

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java

@@ -76,8 +76,8 @@ public class DmsBillsInspectInstanceController extends BaseController {
     @Log(title = "点巡检工单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBillsInspectInstanceBo bo) {
+    public R<DmsBillsInspectInstanceVo> add(@Validated(AddGroup.class) @RequestBody DmsBillsInspectInstanceBo bo) {
-        return toAjax(dmsBillsInspectInstanceService.insertByBo(bo));
+        return R.ok(dmsBillsInspectInstanceService.insertByBo(bo));
     }
 
     /**
@@ -87,8 +87,8 @@ public class DmsBillsInspectInstanceController extends BaseController {
     @Log(title = "点巡检工单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBillsInspectInstanceBo bo) {
+    public R<DmsBillsInspectInstanceVo> edit(@Validated(EditGroup.class) @RequestBody DmsBillsInspectInstanceBo bo) {
-        return toAjax(dmsBillsInspectInstanceService.updateByBo(bo));
+        return R.ok(dmsBillsInspectInstanceService.updateByBo(bo));
     }
 
     /**

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsLubeInstanceController.java

@@ -77,8 +77,8 @@ public class DmsBillsLubeInstanceController extends BaseController {
     @Log(title = "润滑工单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBillsLubeInstanceBo bo) {
+    public R<DmsBillsLubeInstanceVo> add(@Validated(AddGroup.class) @RequestBody DmsBillsLubeInstanceBo bo) {
-        return toAjax(dmsBillsLubeInstanceService.insertByBo(bo));
+        return R.ok(dmsBillsLubeInstanceService.insertByBo(bo));
     }
 
     /**
@@ -88,8 +88,8 @@ public class DmsBillsLubeInstanceController extends BaseController {
     @Log(title = "润滑工单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBillsLubeInstanceBo bo) {
+    public R<DmsBillsLubeInstanceVo> edit(@Validated(EditGroup.class) @RequestBody DmsBillsLubeInstanceBo bo) {
-        return toAjax(dmsBillsLubeInstanceService.updateByBo(bo));
+        return R.ok(dmsBillsLubeInstanceService.updateByBo(bo));
     }
 
     /**

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstance.java

@@ -86,4 +86,10 @@ public class DmsBillsInspectInstance extends TenantEntity {
     private String remark;
 
 
+    /**
+     * 流程状态
+     */
+    private String status;
+
+
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsLubeInstance.java

@@ -30,7 +30,7 @@ public class DmsBillsLubeInstance extends BaseEntity {
     /**
      * 主键标识
      */
-    @TableId(value = "lube_instance_id", type = IdType.AUTO)
+    @TableId(value = "lube_instance_id")
     private Long lubeInstanceId;
 
     /**
@@ -93,6 +93,12 @@ public class DmsBillsLubeInstance extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 流程状态
+     */
+    private String status;
+
+
     /**
      * 计划编号
      */

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsInspectInstanceBo.java

@@ -82,5 +82,10 @@ public class DmsBillsInspectInstanceBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 流程状态
+     */
+    private String status;
+
 
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsLubeInstanceBo.java

@@ -88,6 +88,11 @@ public class DmsBillsLubeInstanceBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 流程状态
+     */
+    private String status;
+
 
     private String lubeStatusStr;//常量拼接的状态值
 

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsInspectInstanceVo.java

@@ -104,5 +104,10 @@ public class DmsBillsInspectInstanceVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 流程状态
+     */
+    private String status;
+
 
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeInstanceVo.java

@@ -1,7 +1,10 @@
 package org.dromara.dms.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -109,6 +112,11 @@ public class DmsBillsLubeInstanceVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 流程状态
+     */
+    private String status;
+
     /**
      * 计划编号
      */
@@ -119,4 +127,17 @@ public class DmsBillsLubeInstanceVo implements Serializable {
      */
     private List<DmsBillsLubeDetailVo> dmsBillsLubeDetailList;
 
+
+    /**
+     * 创建者
+     */
+    @ExcelIgnore
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelIgnore
+    private Date createTime;
+
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteLubeInstanceServiceImpl.java

@@ -12,6 +12,7 @@ import org.dromara.common.core.utils.uuid.Seq;
 import org.dromara.dms.domain.*;
 import org.dromara.dms.domain.bo.DmsBillsLubeInstanceBo;
 import org.dromara.dms.domain.bo.DmsPlanLubeBo;
+import org.dromara.dms.domain.vo.DmsBillsLubeInstanceVo;
 import org.dromara.dms.domain.vo.DmsPlanLubeDetailVo;
 import org.dromara.dms.mapper.*;
 import org.dromara.dms.service.IDmsBillsLubeInstanceService;
@@ -76,6 +77,8 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService
 
         // 创建新的润滑工单实例对象
         DmsBillsLubeInstanceBo dmsBillsLubeInstanceBo = new DmsBillsLubeInstanceBo();
+        //  设置创建人
+        dmsBillsLubeInstanceBo.setCreateBy(dmsPlanLube.getCreateBy());
         // 设置润滑工单的计划ID
         dmsBillsLubeInstanceBo.setPlanLubeId(dmsPlanLube.getPlanLubeId());
         // 设置计划开始时间为润滑时间
@@ -97,7 +100,7 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService
         dmsBillsLubeInstanceBo.setPlanEndTime(planEndTime);
 
         // 插入润滑工单实例到数据库
-        boolean success = dmsBillsLubeInstanceService.insertByBo(dmsBillsLubeInstanceBo);
+        DmsBillsLubeInstanceVo BillsLubeInstance = dmsBillsLubeInstanceService.insertByBo(dmsBillsLubeInstanceBo);
 
         DmsPlanLubeBo dmsPlanLubeBo = MapstructUtils.convert(dmsPlanLube, DmsPlanLubeBo.class);
 

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java

@@ -48,7 +48,7 @@ public interface IDmsBillsInspectInstanceService {
      * @param bo 点巡检工单
      * @return 是否新增成功
      */
-    Boolean insertByBo(DmsBillsInspectInstanceBo bo);
+    DmsBillsInspectInstanceVo insertByBo(DmsBillsInspectInstanceBo bo);
 
     /**
      * 修改点巡检工单
@@ -56,7 +56,7 @@ public interface IDmsBillsInspectInstanceService {
      * @param bo 点巡检工单
      * @return 是否修改成功
      */
-    Boolean updateByBo(DmsBillsInspectInstanceBo bo);
+    DmsBillsInspectInstanceVo updateByBo(DmsBillsInspectInstanceBo bo);
 
     /**
      * 校验并批量删除点巡检工单信息

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceService.java

@@ -48,7 +48,7 @@ public interface IDmsBillsLubeInstanceService {
      * @param bo 润滑工单
      * @return 是否新增成功
      */
-    Boolean insertByBo(DmsBillsLubeInstanceBo bo);
+    DmsBillsLubeInstanceVo insertByBo(DmsBillsLubeInstanceBo bo);
 
     /**
      * 修改润滑工单
@@ -56,7 +56,7 @@ public interface IDmsBillsLubeInstanceService {
      * @param bo 润滑工单
      * @return 是否修改成功
      */
-    Boolean updateByBo(DmsBillsLubeInstanceBo bo);
+    DmsBillsLubeInstanceVo updateByBo(DmsBillsLubeInstanceBo bo);
 
     /**
      * 校验并批量删除润滑工单信息

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java

@@ -108,14 +108,14 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(DmsBillsInspectInstanceBo bo) {
+    public DmsBillsInspectInstanceVo insertByBo(DmsBillsInspectInstanceBo bo) {
         DmsBillsInspectInstance add = MapstructUtils.convert(bo, DmsBillsInspectInstance.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setInspectInstanceId(add.getInspectInstanceId());
         }
-        return flag;
+        return MapstructUtils.convert(add, DmsBillsInspectInstanceVo.class);
     }
 
     /**
@@ -125,10 +125,10 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(DmsBillsInspectInstanceBo bo) {
+    public DmsBillsInspectInstanceVo updateByBo(DmsBillsInspectInstanceBo bo) {
         DmsBillsInspectInstance update = MapstructUtils.convert(bo, DmsBillsInspectInstance.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return MapstructUtils.convert(update, DmsBillsInspectInstanceVo.class);
     }
 
     /**

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java

@@ -29,6 +29,7 @@ import org.dromara.dms.mapper.*;
 import org.dromara.dms.service.IDmsBillsLubeInstanceService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -124,14 +125,14 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(DmsBillsLubeInstanceBo bo) {
+    public DmsBillsLubeInstanceVo insertByBo(DmsBillsLubeInstanceBo bo) {
         DmsBillsLubeInstance add = MapstructUtils.convert(bo, DmsBillsLubeInstance.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setLubeInstanceId(add.getLubeInstanceId());
         }
-        return flag;
+        return MapstructUtils.convert(add, DmsBillsLubeInstanceVo.class);
     }
 
     /**
@@ -141,10 +142,10 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(DmsBillsLubeInstanceBo bo) {
+    public DmsBillsLubeInstanceVo updateByBo(DmsBillsLubeInstanceBo bo) {
         DmsBillsLubeInstance update = MapstructUtils.convert(bo, DmsBillsLubeInstance.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return MapstructUtils.convert(update, DmsBillsLubeInstanceVo.class);
     }
 
     /**
@@ -225,13 +226,13 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
         dmsBillsLubeInstanceBo.setPlanEndTime(planEndTime);
 
         // 插入润滑工单实例到数据库
-        boolean success = this.insertByBo(dmsBillsLubeInstanceBo);
+        DmsBillsLubeInstanceVo billsLubeInstance = this.insertByBo(dmsBillsLubeInstanceBo);
 
         DmsPlanLubeBo  dmsPlanLubeBo = MapstructUtils.convert(dmsPlanLube, DmsPlanLubeBo.class);
         // 批量插入润滑工单详情
         batchInsertDmsBillsLubeDetail(dmsPlanLubeBo, dmsBillsLubeInstanceBo.getLubeInstanceId());
 
-        return success;
+        return !ObjectUtils.isEmpty(billsLubeInstance);//不为空返回true
     }
 
     /**