feat(dms): 润滑实例表添加工作流定义 ID 字段并实现相关功能

- 在 DmsBillsLubeInstance模型中添加 wfDefinitionId 字段
- 在相关 BO、VO 类中添加 wfDefinitionId 属性
- 新增更新润滑实例工作流定义 ID 的接口和实现方法
- 优化查询条件，支持按工作流定义 ID 查询

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

@@ -15,6 +15,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.dms.domain.bo.DmsBillsLubeDetailBo;
 import org.dromara.dms.domain.bo.DmsBillsLubeInstanceBo;
 import org.dromara.dms.domain.vo.DmsBillsLubeInstanceVo;
 import org.dromara.dms.service.IDmsBillsLubeInstanceService;
@@ -124,4 +125,17 @@ public class DmsBillsLubeInstanceController extends BaseController {
     {
         return toAjax(dmsBillsLubeInstanceService.insertDmsBillsLubeInstance(lubeInstanceCode));
     }
+
+    /**
+     * 更新润滑实例的工作流定义ID
+     * @param lubeInstanceId 润滑实例的ID
+     * @param wfDefinitionId 工作流定义的ID
+     * @return 如果更新成功返回true，否则返回false
+     */
+    @PostMapping("/updateWfDefinitionIdById")
+    public R updateWfDefinitionIdById(@RequestParam Long lubeInstanceId, @RequestParam Long wfDefinitionId)
+    {
+        return toAjax(dmsBillsLubeInstanceService.updateWfDefinitionIdById(lubeInstanceId, wfDefinitionId));
+    }
+
 }

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

@@ -99,6 +99,11 @@ public class DmsBillsLubeInstance extends TenantEntity {
      */
     private String status;
 
+    /**
+     * 流程定义ID，关联wf_definition_config的id
+     */
+    private Long wfDefinitionId;
+
 
     /**
      * 计划编号

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

@@ -97,4 +97,9 @@ public class DmsBillsLubeInstanceBo extends BaseEntity {
     private String lubeStatusStr;//常量拼接的状态值
 
 
+    /**
+     * 流程定义ID，关联wf_definition_config的id
+     */
+    private Long wfDefinitionId;
+
 }

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

@@ -117,6 +117,11 @@ public class DmsBillsLubeInstanceVo implements Serializable {
      */
     private String status;
 
+    /**
+     * 流程定义ID，关联wf_definition_config的id
+     */
+    private Long wfDefinitionId;
+
     /**
      * 计划编号
      */

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

@@ -14,10 +14,7 @@ import org.dromara.common.mybatis.Utils.UniqueCodeUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.dms.domain.DmsBillsLubeDetail;
-import org.dromara.dms.domain.DmsBillsLubeInstance;
-import org.dromara.dms.domain.DmsPlanLube;
-import org.dromara.dms.domain.DmsPlanLubeDetail;
+import org.dromara.dms.domain.*;
 import org.dromara.dms.domain.bo.DmsBillsLubeDetailBo;
 import org.dromara.dms.domain.bo.DmsBillsLubeInstanceBo;
 import org.dromara.dms.domain.bo.DmsPlanLubeBo;
@@ -104,6 +101,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
 
         .eq(bo.getLubeInstanceId() != null, DmsBillsLubeInstance::getLubeInstanceId, bo.getLubeInstanceId())
         .eq(bo.getPlanLubeId() != null, DmsBillsLubeInstance::getPlanLubeId, bo.getPlanLubeId())
+            .eq(bo.getWfDefinitionId() != null, DmsBillsLubeInstance::getWfDefinitionId, bo.getWfDefinitionId())
         .eq(StringUtils.isNotBlank(bo.getBillsLubeCode()), DmsBillsLubeInstance::getBillsLubeCode, bo.getBillsLubeCode())
         .eq(StringUtils.isNotBlank(bo.getLubeGroup()), DmsBillsLubeInstance::getLubeGroup, bo.getLubeGroup())
         .eq(StringUtils.isNotBlank(bo.getLubeSupervisor()), DmsBillsLubeInstance::getLubeSupervisor, bo.getLubeSupervisor())
@@ -428,4 +426,26 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
 
         return 1;
     }
+
+
+    /**
+     * 更新润滑实例的工作流定义ID
+     * @param lubeInstanceId 润滑实例的ID
+     * @param wfDefinitionId 工作流定义的ID
+     * @return 如果更新成功返回true，否则返回false
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateWfDefinitionIdById(Long lubeInstanceId, Long wfDefinitionId) {
+        if(ObjectUtils.isEmpty(lubeInstanceId)){
+            throw new ServiceException("参数为空");
+        }
+        DmsBillsLubeInstance entity = baseMapper.selectById(lubeInstanceId);
+        if (entity == null) {
+            throw new ServiceException("记录不存在");
+        }
+        entity.setWfDefinitionId(wfDefinitionId);  // 假设字段已存在于实体中
+        return baseMapper.updateById(entity) > 0;
+    }
+
 }