diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceActivityController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceActivityController.java new file mode 100644 index 0000000..cfa37b0 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceActivityController.java @@ -0,0 +1,117 @@ +package org.dromara.dms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.dms.domain.vo.DmsBillsInspectInstanceActivityVo; +import org.dromara.dms.domain.bo.DmsBillsInspectInstanceActivityBo; +import org.dromara.dms.service.IDmsBillsInspectInstanceActivityService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点巡检工单实例节点;此暂时不用 + * 前端访问路由地址为:/dms/dmsBillsInspectInstanceActivity + * + * @author zch + * @date 2025-05-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsBillsInspectInstanceActivity") +public class DmsBillsInspectInstanceActivityController extends BaseController { + + private final IDmsBillsInspectInstanceActivityService dmsBillsInspectInstanceActivityService; + + /** + * 查询点巡检工单实例节点;此暂时不用列表 + */ + @SaCheckPermission("dms:dmsBillsInspectInstanceActivity:list") + @GetMapping("/list") + public TableDataInfo list(DmsBillsInspectInstanceActivityBo bo, PageQuery pageQuery) { + return dmsBillsInspectInstanceActivityService.queryPageList(bo, pageQuery); + } + + /** + * 导出点巡检工单实例节点;此暂时不用列表 + */ + @SaCheckPermission("dms:dmsBillsInspectInstanceActivity:export") + @Log(title = "点巡检工单实例节点;此暂时不用", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsBillsInspectInstanceActivityBo bo, HttpServletResponse response) { + List list = dmsBillsInspectInstanceActivityService.queryList(bo); + ExcelUtil.exportExcel(list, "点巡检工单实例节点;此暂时不用", DmsBillsInspectInstanceActivityVo.class, response); + } + + /** + * 获取点巡检工单实例节点;此暂时不用详细信息 + * + * @param instanceActivityId 主键 + */ + @SaCheckPermission("dms:dmsBillsInspectInstanceActivity:query") + @GetMapping("/{instanceActivityId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long instanceActivityId) { + return R.ok(dmsBillsInspectInstanceActivityService.queryById(instanceActivityId)); + } + + /** + * 新增点巡检工单实例节点;此暂时不用 + */ + @SaCheckPermission("dms:dmsBillsInspectInstanceActivity:add") + @Log(title = "点巡检工单实例节点;此暂时不用", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsBillsInspectInstanceActivityBo bo) { + return R.ok(dmsBillsInspectInstanceActivityService.insertByBo(bo)); + } + + /** + * 修改点巡检工单实例节点;此暂时不用 + */ + @SaCheckPermission("dms:dmsBillsInspectInstanceActivity:edit") + @Log(title = "点巡检工单实例节点;此暂时不用", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsBillsInspectInstanceActivityBo bo) { + return R.ok(dmsBillsInspectInstanceActivityService.updateByBo(bo)); + } + + /** + * 删除点巡检工单实例节点;此暂时不用 + * + * @param instanceActivityIds 主键串 + */ + @SaCheckPermission("dms:dmsBillsInspectInstanceActivity:remove") + @Log(title = "点巡检工单实例节点;此暂时不用", businessType = BusinessType.DELETE) + @DeleteMapping("/{instanceActivityIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] instanceActivityIds) { + return toAjax(dmsBillsInspectInstanceActivityService.deleteWithValidByIds(List.of(instanceActivityIds), true)); + } + + + /** + * 下拉框查询点巡检工单实例节点;此暂时不用列表 + */ + + @GetMapping("/getDmsBillsInspectInstanceActivityList") + public R> getDmsBillsInspectInstanceActivityList(DmsBillsInspectInstanceActivityBo bo) { + List list = dmsBillsInspectInstanceActivityService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java index 8b7dff8..acc74b7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java @@ -114,4 +114,16 @@ public class DmsBillsInspectInstanceController extends BaseController { List list = dmsBillsInspectInstanceService.queryList(bo); return R.ok(list); } + + /** + * 更新点巡检实例的工作流定义ID + * @param inspectInstanceId 点巡检实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + @PostMapping("/updateWfDefinitionIdById") + public R updateWfDefinitionIdById(@RequestParam Long inspectInstanceId, @RequestParam Long wfDefinitionId) + { + return toAjax(dmsBillsInspectInstanceService.updateWfDefinitionIdById(inspectInstanceId, wfDefinitionId)); + } } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java index 3dbdb8d..1644a17 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java @@ -121,4 +121,16 @@ public class DmsBillsMaintInstanceController extends BaseController { { return R.ok(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(planMaintCode)); } + + /** + * 更新保养实例的工作流定义ID + * @param maintInstanceId 保养实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + @PostMapping("/updateWfDefinitionIdById") + public R updateWfDefinitionIdById(@RequestParam Long maintInstanceId, @RequestParam Long wfDefinitionId) + { + return toAjax(dmsBillsMaintInstanceService.updateWfDefinitionIdById(maintInstanceId, wfDefinitionId)); + } } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMaintInstanceActivityController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMaintInstanceActivityController.java new file mode 100644 index 0000000..2516611 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMaintInstanceActivityController.java @@ -0,0 +1,117 @@ +package org.dromara.dms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.dms.domain.vo.DmsMaintInstanceActivityVo; +import org.dromara.dms.domain.bo.DmsMaintInstanceActivityBo; +import org.dromara.dms.service.IDmsMaintInstanceActivityService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保养工单实例节点;弃用 + * 前端访问路由地址为:/dms/dmsMaintInstanceActivity + * + * @author zch + * @date 2025-05-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/dmsMaintInstanceActivity") +public class DmsMaintInstanceActivityController extends BaseController { + + private final IDmsMaintInstanceActivityService dmsMaintInstanceActivityService; + + /** + * 查询保养工单实例节点;弃用列表 + */ + @SaCheckPermission("dms:dmsMaintInstanceActivity:list") + @GetMapping("/list") + public TableDataInfo list(DmsMaintInstanceActivityBo bo, PageQuery pageQuery) { + return dmsMaintInstanceActivityService.queryPageList(bo, pageQuery); + } + + /** + * 导出保养工单实例节点;弃用列表 + */ + @SaCheckPermission("dms:dmsMaintInstanceActivity:export") + @Log(title = "保养工单实例节点;弃用", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DmsMaintInstanceActivityBo bo, HttpServletResponse response) { + List list = dmsMaintInstanceActivityService.queryList(bo); + ExcelUtil.exportExcel(list, "保养工单实例节点;弃用", DmsMaintInstanceActivityVo.class, response); + } + + /** + * 获取保养工单实例节点;弃用详细信息 + * + * @param instanceActivityId 主键 + */ + @SaCheckPermission("dms:dmsMaintInstanceActivity:query") + @GetMapping("/{instanceActivityId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long instanceActivityId) { + return R.ok(dmsMaintInstanceActivityService.queryById(instanceActivityId)); + } + + /** + * 新增保养工单实例节点;弃用 + */ + @SaCheckPermission("dms:dmsMaintInstanceActivity:add") + @Log(title = "保养工单实例节点;弃用", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DmsMaintInstanceActivityBo bo) { + return R.ok(dmsMaintInstanceActivityService.insertByBo(bo)); + } + + /** + * 修改保养工单实例节点;弃用 + */ + @SaCheckPermission("dms:dmsMaintInstanceActivity:edit") + @Log(title = "保养工单实例节点;弃用", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DmsMaintInstanceActivityBo bo) { + return R.ok(dmsMaintInstanceActivityService.updateByBo(bo)); + } + + /** + * 删除保养工单实例节点;弃用 + * + * @param instanceActivityIds 主键串 + */ + @SaCheckPermission("dms:dmsMaintInstanceActivity:remove") + @Log(title = "保养工单实例节点;弃用", businessType = BusinessType.DELETE) + @DeleteMapping("/{instanceActivityIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] instanceActivityIds) { + return toAjax(dmsMaintInstanceActivityService.deleteWithValidByIds(List.of(instanceActivityIds), true)); + } + + + /** + * 下拉框查询保养工单实例节点;弃用列表 + */ + + @GetMapping("/getDmsMaintInstanceActivityList") + public R> getDmsMaintInstanceActivityList(DmsMaintInstanceActivityBo bo) { + List list = dmsMaintInstanceActivityService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRepairInstanceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRepairInstanceController.java index ee873e6..9834f5d 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRepairInstanceController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRepairInstanceController.java @@ -114,4 +114,16 @@ public class DmsRepairInstanceController extends BaseController { List list = dmsRepairInstanceService.queryList(bo); return R.ok(list); } + + /** + * 更新检修实例的工作流定义ID + * @param repairInstanceId 检修实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + @PostMapping("/updateWfDefinitionIdById") + public R updateWfDefinitionIdById(@RequestParam Long repairInstanceId, @RequestParam Long wfDefinitionId) + { + return toAjax(dmsRepairInstanceService.updateWfDefinitionIdById(repairInstanceId, wfDefinitionId)); + } } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstance.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstance.java index d3502ef..c6c38ae 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstance.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstance.java @@ -27,7 +27,8 @@ public class DmsBillsInspectInstance extends TenantEntity { /** * 主键标识 */ - @TableId(value = "inspect_instance_id", type = IdType.AUTO) +// @TableId(value = "inspect_instance_id", type = IdType.AUTO) + @TableId(value = "inspect_instance_id") private Long inspectInstanceId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstanceActivity.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstanceActivity.java new file mode 100644 index 0000000..6452d07 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsInspectInstanceActivity.java @@ -0,0 +1,117 @@ +package org.dromara.dms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + +import java.io.Serial; + +/** + * 点巡检工单实例节点;此暂时不用对象 dms_bills_inspect_instance_activity + * + * @author zch + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_bills_inspect_instance_activity") +public class DmsBillsInspectInstanceActivity extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 巡检工单实例节点ID + */ + @TableId(value = "instance_activity_id", type = IdType.AUTO) + private Long instanceActivityId; + + /** + * 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id + */ + private Long inspectInstanceId; + + /** + * 流程定义ID，关联wf_definition_config的id + */ + private Long wfDefinitionId; + + /** + * 工单流程节点ID（关联wf_task_back_node的id） + */ + private Long wfNodeId; + + /** + * 巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private Long inspectRouteId; + + /** + * 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private Long deviceAmount; + + /** + * 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String performer; + + /** + * 处理意见;第一步不显示，从第2步开始只显示此字段 + */ + private String processHandleResolution; + + /** + * 状态(0已结束 1执行中 2待接取 3已转发） + */ + private String processHandleStatus; + + /** + * 工单流程步骤顺序 + */ + private Long processStepOrder; + + /** + * 执行开始时间 + */ + private Date startTime; + + /** + * 执行结束时间 + */ + private Date endTime; + + /** + * 处理人ID（关联sys_user的user_id) + */ + private Long handleUserId; + + /** + * 处理人 + */ + private String handleBy; + + /** + * 处理时间 + */ + private Date handleTime; + + /** + * 转单人用户id或转发协助用户id + */ + private Long transferUserId; + + /** + * 用户预留1 + */ + private String attr1; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsMaintInstanceActivity.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsMaintInstanceActivity.java new file mode 100644 index 0000000..8b63753 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsMaintInstanceActivity.java @@ -0,0 +1,118 @@ +package org.dromara.dms.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 保养工单实例节点;弃用对象 dms_maint_instance_activity + * + * @author zch + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dms_maint_instance_activity") +public class DmsMaintInstanceActivity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 保养工单实例节点ID + */ + @TableId(value = "instance_activity_id", type = IdType.AUTO) + private Long instanceActivityId; + + /** + * 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id + */ + private Long maintInstanceId; + + /** + * 流程定义ID,关联wf_definition_config的id + */ + private Long wfDefinitionId; + + /** + * 工单流程节点ID（关联wf_task_back_node的id） + */ + private Long wfNodeId; + + /** + * 保养级别（1日常保养 2月度保养 3年度保养）;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String maintLevel; + + /** + * 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String maintGroup; + + /** + * 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String maintSupervisor; + + /** + * 处理意见;第一步不显示，从第二步开始只显示此字段 + */ + private String processHandleResolution; + + /** + * 状态(0已结束 1执行中 2待接取 3已转发） + */ + private String processHandleStatus; + + /** + * 工单流程步骤顺序 + */ + private Long processStepOrder; + + /** + * 执行开始时间 + */ + private Date startTime; + + /** + * 执行结束时间 + */ + private Date endTime; + + /** + * 处理人ID（关联sys_user的user_id) + */ + private Long handleUserId; + + /** + * 处理人 + */ + private String handleBy; + + /** + * 处理时间 + */ + private Date handleTime; + + /** + * 转单人用户id或转发协助用户id + */ + private Long transferUserId; + + /** + * 用户预留1 + */ + private String attr1; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java index 6b56d41..9f29017 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java @@ -28,7 +28,8 @@ public class DmsPlanInspect extends TenantEntity { /** * 主键标识 */ - @TableId(value = "plan_inspect_id", type = IdType.AUTO) +// @TableId(value = "plan_inspect_id", type = IdType.AUTO) + @TableId(value = "plan_inspect_id") private Long planInspectId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsInspectInstanceActivityBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsInspectInstanceActivityBo.java new file mode 100644 index 0000000..85b3283 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsInspectInstanceActivityBo.java @@ -0,0 +1,116 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsBillsInspectInstanceActivity; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 点巡检工单实例节点;此暂时不用业务对象 dms_bills_inspect_instance_activity + * + * @author zch + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsBillsInspectInstanceActivity.class, reverseConvertGenerate = true) +public class DmsBillsInspectInstanceActivityBo extends BaseEntity { + + /** + * 巡检工单实例节点ID + */ + private Long instanceActivityId; + + /** + * 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id + */ + private Long inspectInstanceId; + + /** + * 流程定义ID，关联wf_definition_config的id + */ + private Long wfDefinitionId; + + /** + * 工单流程节点ID（关联wf_task_back_node的id） + */ + private Long wfNodeId; + + /** + * 巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private Long inspectRouteId; + + /** + * 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private Long deviceAmount; + + /** + * 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String performer; + + /** + * 处理意见;第一步不显示，从第2步开始只显示此字段 + */ + private String processHandleResolution; + + /** + * 状态(0已结束 1执行中 2待接取 3已转发） + */ + private String processHandleStatus; + + /** + * 工单流程步骤顺序 + */ + private Long processStepOrder; + + /** + * 执行开始时间 + */ + private Date startTime; + + /** + * 执行结束时间 + */ + private Date endTime; + + /** + * 处理人ID（关联sys_user的user_id) + */ + private Long handleUserId; + + /** + * 处理人 + */ + private String handleBy; + + /** + * 处理时间 + */ + private Date handleTime; + + /** + * 转单人用户id或转发协助用户id + */ + private Long transferUserId; + + /** + * 用户预留1 + */ + private String attr1; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsMaintInstanceActivityBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsMaintInstanceActivityBo.java new file mode 100644 index 0000000..7a23ac6 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsMaintInstanceActivityBo.java @@ -0,0 +1,117 @@ +package org.dromara.dms.domain.bo; + +import org.dromara.dms.domain.DmsMaintInstanceActivity; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 保养工单实例节点;弃用业务对象 dms_maint_instance_activity + * + * @author zch + * @date 2025-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DmsMaintInstanceActivity.class, reverseConvertGenerate = true) +public class DmsMaintInstanceActivityBo extends BaseEntity { + + /** + * 保养工单实例节点ID + */ + @NotNull(message = "保养工单实例节点ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long instanceActivityId; + + /** + * 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id + */ + private Long maintInstanceId; + + /** + * 流程定义ID,关联wf_definition_config的id + */ + private Long wfDefinitionId; + + /** + * 工单流程节点ID（关联wf_task_back_node的id） + */ + private Long wfNodeId; + + /** + * 保养级别（1日常保养 2月度保养 3年度保养）;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String maintLevel; + + /** + * 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String maintGroup; + + /** + * 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + private String maintSupervisor; + + /** + * 处理意见;第一步不显示，从第二步开始只显示此字段 + */ + private String processHandleResolution; + + /** + * 状态(0已结束 1执行中 2待接取 3已转发） + */ + private String processHandleStatus; + + /** + * 工单流程步骤顺序 + */ + private Long processStepOrder; + + /** + * 执行开始时间 + */ + private Date startTime; + + /** + * 执行结束时间 + */ + private Date endTime; + + /** + * 处理人ID（关联sys_user的user_id) + */ + private Long handleUserId; + + /** + * 处理人 + */ + private String handleBy; + + /** + * 处理时间 + */ + private Date handleTime; + + /** + * 转单人用户id或转发协助用户id + */ + private Long transferUserId; + + /** + * 用户预留1 + */ + private String attr1; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsInspectInstanceActivityVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsInspectInstanceActivityVo.java new file mode 100644 index 0000000..769521e --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsInspectInstanceActivityVo.java @@ -0,0 +1,145 @@ +package org.dromara.dms.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.dms.domain.DmsBillsInspectInstanceActivity; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 点巡检工单实例节点;此暂时不用视图对象 dms_bills_inspect_instance_activity + * + * @author zch + * @date 2025-05-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsBillsInspectInstanceActivity.class, reverseConvertGenerate = true) +public class DmsBillsInspectInstanceActivityVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 巡检工单实例节点ID + */ + @ExcelProperty(value = "巡检工单实例节点ID") + private Long instanceActivityId; + + /** + * 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id + */ + @ExcelProperty(value = "巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id") + private Long inspectInstanceId; + + /** + * 流程定义ID，关联wf_definition_config的id + */ + @ExcelProperty(value = "流程定义ID，关联wf_definition_config的id") + private Long wfDefinitionId; + + /** + * 工单流程节点ID（关联wf_task_back_node的id） + */ + @ExcelProperty(value = "工单流程节点ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联wf_task_back_node的id") + private Long wfNodeId; + + /** + * 巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + @ExcelProperty(value = "巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private Long inspectRouteId; + + /** + * 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + @ExcelProperty(value = "设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private Long deviceAmount; + + /** + * 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + @ExcelProperty(value = "执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private String performer; + + /** + * 处理意见;第一步不显示，从第2步开始只显示此字段 + */ + @ExcelProperty(value = "处理意见;第一步不显示，从第2步开始只显示此字段") + private String processHandleResolution; + + /** + * 状态(0已结束 1执行中 2待接取 3已转发） + */ + @ExcelProperty(value = "状态(0已结束 1执行中 2待接取 3已转发）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "process_handle_status") + private String processHandleStatus; + + /** + * 工单流程步骤顺序 + */ + @ExcelProperty(value = "工单流程步骤顺序") + private Long processStepOrder; + + /** + * 执行开始时间 + */ + @ExcelProperty(value = "执行开始时间") + private Date startTime; + + /** + * 执行结束时间 + */ + @ExcelProperty(value = "执行结束时间") + private Date endTime; + + /** + * 处理人ID（关联sys_user的user_id) + */ + @ExcelProperty(value = "处理人ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "处理人ID（关联sys_user的user_id)") + private Long handleUserId; + + /** + * 处理人 + */ + @ExcelProperty(value = "处理人") + private String handleBy; + + /** + * 处理时间 + */ + @ExcelProperty(value = "处理时间") + private Date handleTime; + + /** + * 转单人用户id或转发协助用户id + */ + @ExcelProperty(value = "转单人用户id或转发协助用户id") + private Long transferUserId; + + /** + * 用户预留1 + */ + @ExcelProperty(value = "用户预留1") + private String attr1; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsMaintInstanceActivityVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsMaintInstanceActivityVo.java new file mode 100644 index 0000000..e29c4e4 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsMaintInstanceActivityVo.java @@ -0,0 +1,143 @@ +package org.dromara.dms.domain.vo; + +import java.util.Date; +import org.dromara.dms.domain.DmsMaintInstanceActivity; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 保养工单实例节点;弃用视图对象 dms_maint_instance_activity + * + * @author zch + * @date 2025-05-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DmsMaintInstanceActivity.class, reverseConvertGenerate = true) +public class DmsMaintInstanceActivityVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 保养工单实例节点ID + */ + @ExcelProperty(value = "保养工单实例节点ID") + private Long instanceActivityId; + + /** + * 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id + */ + @ExcelProperty(value = "保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id") + private Long maintInstanceId; + + /** + * 流程定义ID,关联wf_definition_config的id + */ + @ExcelProperty(value = "流程定义ID,关联wf_definition_config的id") + private Long wfDefinitionId; + + /** + * 工单流程节点ID（关联wf_task_back_node的id） + */ + @ExcelProperty(value = "工单流程节点ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联wf_task_back_node的id") + private Long wfNodeId; + + /** + * 保养级别（1日常保养 2月度保养 3年度保养）;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + @ExcelProperty(value = "保养级别", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "maint_level") + private String maintLevel; + + /** + * 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + @ExcelProperty(value = "保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private String maintGroup; + + /** + * 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 + */ + @ExcelProperty(value = "保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private String maintSupervisor; + + /** + * 处理意见;第一步不显示，从第二步开始只显示此字段 + */ + @ExcelProperty(value = "处理意见;第一步不显示，从第二步开始只显示此字段") + private String processHandleResolution; + + /** + * 状态(0已结束 1执行中 2待接取 3已转发） + */ + @ExcelProperty(value = "状态(0已结束 1执行中 2待接取 3已转发）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "process_handle_status") + private String processHandleStatus; + + /** + * 工单流程步骤顺序 + */ + @ExcelProperty(value = "工单流程步骤顺序") + private Long processStepOrder; + + /** + * 执行开始时间 + */ + @ExcelProperty(value = "执行开始时间") + private Date startTime; + + /** + * 执行结束时间 + */ + @ExcelProperty(value = "执行结束时间") + private Date endTime; + + /** + * 处理人ID（关联sys_user的user_id) + */ + @ExcelProperty(value = "处理人ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "处理人ID（关联sys_user的user_id)") + private Long handleUserId; + + /** + * 处理人 + */ + @ExcelProperty(value = "处理人") + private String handleBy; + + /** + * 处理时间 + */ + @ExcelProperty(value = "处理时间") + private Date handleTime; + + /** + * 转单人用户id或转发协助用户id + */ + @ExcelProperty(value = "转单人用户id或转发协助用户id") + private Long transferUserId; + + /** + * 用户预留1 + */ + @ExcelProperty(value = "用户预留1") + private String attr1; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteLubeInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteLubeInstanceServiceImpl.java index e1d65d7..c4867fb 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteLubeInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteLubeInstanceServiceImpl.java @@ -1,8 +1,8 @@ package org.dromara.dms.dubbo; - import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import io.seata.spring.annotation.GlobalTransactional; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.constant.DmsConstants; @@ -17,8 +17,8 @@ import org.dromara.dms.domain.vo.DmsPlanLubeDetailVo; import org.dromara.dms.mapper.*; import org.dromara.dms.service.IDmsBillsLubeInstanceService; import org.dromara.dms.service.IDmsPlanInspectService; + import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.dromara.dms.api.RemoteLubeInstanceService; import java.util.ArrayList; @@ -47,11 +47,11 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService private final DmsInspectRouteDetailMapper dmsInspectRouteDetailMapper; - +// private final RemoteWorkflowService remoteWorkflowService; @Override - @Transactional(rollbackFor = Exception.class) + @GlobalTransactional(rollbackFor = Exception.class) public R insertLubeInstance(String planLubeCode, String tenantId, Long userId) { // 去除润滑计划编号中的双引号 // String lubeInstanceCodeS = planLubeCode.replaceAll("\"", ""); @@ -77,8 +77,6 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService // 创建新的润滑工单实例对象 DmsBillsLubeInstance dmsBillsLubeInstance = new DmsBillsLubeInstance(); - // 设置创建人 - dmsBillsLubeInstance.setCreateBy(dmsPlanLube.getCreateBy()); // 设置润滑工单的计划ID dmsBillsLubeInstance.setPlanLubeId(dmsPlanLube.getPlanLubeId()); // 设置计划开始时间为润滑时间 @@ -100,14 +98,10 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService dmsBillsLubeInstance.setPlanEndTime(planEndTime); dmsBillsLubeInstance.setCreateBy(userId); -// dmsBillsLubeInstance.setCreateTime(new Date()); dmsBillsLubeInstance.setTenantId(tenantId); - // 插入润滑工单实例到数据库 int i = dmsBillsLubeInstanceMapper.insert(dmsBillsLubeInstance); DmsPlanLubeBo dmsPlanLubeBo = MapstructUtils.convert(dmsPlanLube, DmsPlanLubeBo.class); - - // 批量插入润滑工单详情 List lubeDetails = dmsPlanLubeBo.getDmsPlanLubeDetailList(); List billsLubeDetails = new ArrayList<>(); @@ -128,6 +122,4 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService return R.ok(); } - - } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsInspectInstanceActivityMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsInspectInstanceActivityMapper.java new file mode 100644 index 0000000..5523cd6 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsInspectInstanceActivityMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsBillsInspectInstanceActivity; +import org.dromara.dms.domain.vo.DmsBillsInspectInstanceActivityVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点巡检工单实例节点;此暂时不用Mapper接口 + * + * @author zch + * @date 2025-05-19 + */ +public interface DmsBillsInspectInstanceActivityMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsMaintInstanceActivityMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsMaintInstanceActivityMapper.java new file mode 100644 index 0000000..84ee4a5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsMaintInstanceActivityMapper.java @@ -0,0 +1,15 @@ +package org.dromara.dms.mapper; + +import org.dromara.dms.domain.DmsMaintInstanceActivity; +import org.dromara.dms.domain.vo.DmsMaintInstanceActivityVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保养工单实例节点;弃用Mapper接口 + * + * @author zch + * @date 2025-05-19 + */ +public interface DmsMaintInstanceActivityMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceActivityService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceActivityService.java new file mode 100644 index 0000000..5a5628b --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceActivityService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsBillsInspectInstanceActivity; +import org.dromara.dms.domain.vo.DmsBillsInspectInstanceActivityVo; +import org.dromara.dms.domain.bo.DmsBillsInspectInstanceActivityBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 点巡检工单实例节点;此暂时不用Service接口 + * + * @author zch + * @date 2025-05-19 + */ +public interface IDmsBillsInspectInstanceActivityService { + + /** + * 查询点巡检工单实例节点;此暂时不用 + * + * @param instanceActivityId 主键 + * @return 点巡检工单实例节点;此暂时不用 + */ + DmsBillsInspectInstanceActivityVo queryById(Long instanceActivityId); + + /** + * 分页查询点巡检工单实例节点;此暂时不用列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检工单实例节点;此暂时不用分页列表 + */ + TableDataInfo queryPageList(DmsBillsInspectInstanceActivityBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点巡检工单实例节点;此暂时不用列表 + * + * @param bo 查询条件 + * @return 点巡检工单实例节点;此暂时不用列表 + */ + List queryList(DmsBillsInspectInstanceActivityBo bo); + + /** + * 新增点巡检工单实例节点;此暂时不用 + * + * @param bo 点巡检工单实例节点;此暂时不用 + * @return 是否新增成功 + */ + DmsBillsInspectInstanceActivityVo insertByBo(DmsBillsInspectInstanceActivityBo bo); + + /** + * 修改点巡检工单实例节点;此暂时不用 + * + * @param bo 点巡检工单实例节点;此暂时不用 + * @return 是否修改成功 + */ + DmsBillsInspectInstanceActivityVo updateByBo(DmsBillsInspectInstanceActivityBo bo); + + /** + * 校验并批量删除点巡检工单实例节点;此暂时不用信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java index 3b10759..920951f 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java @@ -66,4 +66,12 @@ public interface IDmsBillsInspectInstanceService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 更新点巡检实例的工作流定义ID + * @param inspectInstanceId 点巡检实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + public Boolean updateWfDefinitionIdById(Long inspectInstanceId, Long wfDefinitionId); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceActivityService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceActivityService.java index 9eb3196..53c45f6 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceActivityService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceActivityService.java @@ -45,9 +45,9 @@ public interface IDmsBillsLubeInstanceActivityService { * 新增润滑工单实例节点 * * @param bo 润滑工单实例节点 - * @return 是否新增成功 + * @return 新增的润滑工单实例节点实体 */ - Boolean insertByBo(DmsBillsLubeInstanceActivityBo bo); + DmsBillsLubeInstanceActivityVo insertByBo(DmsBillsLubeInstanceActivityBo bo); /** * 修改润滑工单实例节点 @@ -55,7 +55,7 @@ public interface IDmsBillsLubeInstanceActivityService { * @param bo 润滑工单实例节点 * @return 是否修改成功 */ - Boolean updateByBo(DmsBillsLubeInstanceActivityBo bo); + DmsBillsLubeInstanceActivityVo updateByBo(DmsBillsLubeInstanceActivityBo bo); /** * 校验并批量删除润滑工单实例节点信息 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceService.java index 8cbb3e0..d805865 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsLubeInstanceService.java @@ -99,4 +99,13 @@ public interface IDmsBillsLubeInstanceService { * @return 结果 */ public int completeLube(DmsBillsLubeDetailBo bo); + + + /** + * 更新润滑实例的工作流定义ID + * @param lubeInstanceId 润滑实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + public Boolean updateWfDefinitionIdById(Long lubeInstanceId, Long wfDefinitionId); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java index 1befd22..680de0a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java @@ -101,4 +101,12 @@ public interface IDmsBillsMaintInstanceService { * @return 结果 */ public int completeMaint(DmsBillsMaintDetail dmsBillsMaintDetail); + + /** + * 更新保养实例的工作流定义ID + * @param maintInstanceId 保养实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + public Boolean updateWfDefinitionIdById(Long maintInstanceId, Long wfDefinitionId); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsMaintInstanceActivityService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsMaintInstanceActivityService.java new file mode 100644 index 0000000..343fbe5 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsMaintInstanceActivityService.java @@ -0,0 +1,69 @@ +package org.dromara.dms.service; + +import org.dromara.dms.domain.DmsMaintInstanceActivity; +import org.dromara.dms.domain.vo.DmsMaintInstanceActivityVo; +import org.dromara.dms.domain.bo.DmsMaintInstanceActivityBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 保养工单实例节点;弃用Service接口 + * + * @author zch + * @date 2025-05-19 + */ +public interface IDmsMaintInstanceActivityService { + + /** + * 查询保养工单实例节点;弃用 + * + * @param instanceActivityId 主键 + * @return 保养工单实例节点;弃用 + */ + DmsMaintInstanceActivityVo queryById(Long instanceActivityId); + + /** + * 分页查询保养工单实例节点;弃用列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养工单实例节点;弃用分页列表 + */ + TableDataInfo queryPageList(DmsMaintInstanceActivityBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保养工单实例节点;弃用列表 + * + * @param bo 查询条件 + * @return 保养工单实例节点;弃用列表 + */ + List queryList(DmsMaintInstanceActivityBo bo); + + /** + * 新增保养工单实例节点;弃用 + * + * @param bo 保养工单实例节点;弃用 + * @return 是否新增成功 + */ + DmsMaintInstanceActivityVo insertByBo(DmsMaintInstanceActivityBo bo); + + /** + * 修改保养工单实例节点;弃用 + * + * @param bo 保养工单实例节点;弃用 + * @return 是否修改成功 + */ + DmsMaintInstanceActivityVo updateByBo(DmsMaintInstanceActivityBo bo); + + /** + * 校验并批量删除保养工单实例节点;弃用信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRepairInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRepairInstanceService.java index 1c39caa..75f0993 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRepairInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsRepairInstanceService.java @@ -66,4 +66,12 @@ public interface IDmsRepairInstanceService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 更新检修实例的工作流定义ID + * @param repairInstanceId 检修实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + public Boolean updateWfDefinitionIdById(Long repairInstanceId, Long wfDefinitionId); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java new file mode 100644 index 0000000..e184eb8 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java @@ -0,0 +1,155 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsBillsInspectInstanceActivityBo; +import org.dromara.dms.domain.vo.DmsBillsInspectInstanceActivityVo; +import org.dromara.dms.domain.DmsBillsInspectInstanceActivity; +import org.dromara.dms.mapper.DmsBillsInspectInstanceActivityMapper; +import org.dromara.dms.service.IDmsBillsInspectInstanceActivityService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 点巡检工单实例节点;此暂时不用Service业务层处理 + * + * @author zch + * @date 2025-05-19 + */ +@RequiredArgsConstructor +@Service +public class DmsBillsInspectInstanceActivityServiceImpl implements IDmsBillsInspectInstanceActivityService { + + private final DmsBillsInspectInstanceActivityMapper baseMapper; + + /** + * 查询点巡检工单实例节点;此暂时不用 + * + * @param instanceActivityId 主键 + * @return 点巡检工单实例节点;此暂时不用 + */ + @Override + public DmsBillsInspectInstanceActivityVo queryById(Long instanceActivityId){ + return baseMapper.selectVoById(instanceActivityId); + } + + /** + * 分页查询点巡检工单实例节点;此暂时不用列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点巡检工单实例节点;此暂时不用分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsBillsInspectInstanceActivityBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点巡检工单实例节点;此暂时不用列表 + * + * @param bo 查询条件 + * @return 点巡检工单实例节点;此暂时不用列表 + */ + @Override + public List queryList(DmsBillsInspectInstanceActivityBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsBillsInspectInstanceActivityBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBillsInspectInstanceActivity.class) + .selectAll(DmsBillsInspectInstanceActivity.class) + .eq(bo.getInstanceActivityId() != null, DmsBillsInspectInstanceActivity::getInstanceActivityId, bo.getInstanceActivityId()) + .eq(bo.getInspectInstanceId() != null, DmsBillsInspectInstanceActivity::getInspectInstanceId, bo.getInspectInstanceId()) + .eq(bo.getWfDefinitionId() != null, DmsBillsInspectInstanceActivity::getWfDefinitionId, bo.getWfDefinitionId()) + .eq(bo.getWfNodeId() != null, DmsBillsInspectInstanceActivity::getWfNodeId, bo.getWfNodeId()) + .eq(bo.getInspectRouteId() != null, DmsBillsInspectInstanceActivity::getInspectRouteId, bo.getInspectRouteId()) + .eq(bo.getDeviceAmount() != null, DmsBillsInspectInstanceActivity::getDeviceAmount, bo.getDeviceAmount()) + .eq(StringUtils.isNotBlank(bo.getPerformer()), DmsBillsInspectInstanceActivity::getPerformer, bo.getPerformer()) + .eq(StringUtils.isNotBlank(bo.getProcessHandleResolution()), DmsBillsInspectInstanceActivity::getProcessHandleResolution, bo.getProcessHandleResolution()) + .eq(StringUtils.isNotBlank(bo.getProcessHandleStatus()), DmsBillsInspectInstanceActivity::getProcessHandleStatus, bo.getProcessHandleStatus()) + .eq(bo.getProcessStepOrder() != null, DmsBillsInspectInstanceActivity::getProcessStepOrder, bo.getProcessStepOrder()) + .eq(bo.getStartTime() != null, DmsBillsInspectInstanceActivity::getStartTime, bo.getStartTime()) + .eq(bo.getEndTime() != null, DmsBillsInspectInstanceActivity::getEndTime, bo.getEndTime()) + .eq(bo.getHandleUserId() != null, DmsBillsInspectInstanceActivity::getHandleUserId, bo.getHandleUserId()) + .eq(StringUtils.isNotBlank(bo.getHandleBy()), DmsBillsInspectInstanceActivity::getHandleBy, bo.getHandleBy()) + .eq(bo.getHandleTime() != null, DmsBillsInspectInstanceActivity::getHandleTime, bo.getHandleTime()) + .eq(bo.getTransferUserId() != null, DmsBillsInspectInstanceActivity::getTransferUserId, bo.getTransferUserId()) + .eq(StringUtils.isNotBlank(bo.getAttr1()), DmsBillsInspectInstanceActivity::getAttr1, bo.getAttr1()) + .orderByDesc(DmsBillsInspectInstanceActivity::getCreateTime); + return lqw; + } + + /** + * 新增点巡检工单实例节点;此暂时不用 + * + * @param bo 点巡检工单实例节点;此暂时不用 + * @return 是否新增成功 + */ + @Override + public DmsBillsInspectInstanceActivityVo insertByBo(DmsBillsInspectInstanceActivityBo bo) { + DmsBillsInspectInstanceActivity add = MapstructUtils.convert(bo, DmsBillsInspectInstanceActivity.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInstanceActivityId(add.getInstanceActivityId()); + DmsBillsInspectInstanceActivityVo vo = MapstructUtils.convert(add, DmsBillsInspectInstanceActivityVo.class); + return vo; + } + return null; + } + + /** + * 修改点巡检工单实例节点;此暂时不用 + * + * @param bo 点巡检工单实例节点;此暂时不用 + * @return 是否修改成功 + */ + @Override + public DmsBillsInspectInstanceActivityVo updateByBo(DmsBillsInspectInstanceActivityBo bo) { + DmsBillsInspectInstanceActivity update = MapstructUtils.convert(bo, DmsBillsInspectInstanceActivity.class); + validEntityBeforeSave(update); + Boolean flag = baseMapper.updateById(update) > 0; + if (flag) { + DmsBillsInspectInstanceActivityVo vo = MapstructUtils.convert(update, DmsBillsInspectInstanceActivityVo.class); + return vo; + } + return null; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsBillsInspectInstanceActivity entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除点巡检工单实例节点;此暂时不用信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java index 2f4db69..19719cf 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -16,6 +17,8 @@ import org.dromara.dms.domain.vo.DmsBillsInspectInstanceVo; import org.dromara.dms.mapper.DmsBillsInspectInstanceMapper; import org.dromara.dms.service.IDmsBillsInspectInstanceService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.Collection; import java.util.List; @@ -152,4 +155,24 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 更新点巡检实例的工作流定义ID + * @param inspectInstanceId 点巡检实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateWfDefinitionIdById(Long inspectInstanceId, Long wfDefinitionId) { + if(ObjectUtils.isEmpty(inspectInstanceId)){ + throw new ServiceException("参数为空"); + } + DmsBillsInspectInstance entity = baseMapper.selectById(inspectInstanceId); + if (entity == null) { + throw new ServiceException("记录不存在"); + } + entity.setWfDefinitionId(wfDefinitionId); + return baseMapper.updateById(entity) > 0; + } } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java index 398bcf4..2a392b4 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -111,19 +112,23 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns * 新增润滑工单实例节点 * * @param bo 润滑工单实例节点 - * @return 是否新增成功 + * @return 新增的润滑工单实例节点实体，包含数据库生成的ID */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(DmsBillsLubeInstanceActivityBo bo) { + public DmsBillsLubeInstanceActivityVo insertByBo(DmsBillsLubeInstanceActivityBo bo) { // 转换为实体类 DmsBillsLubeInstanceActivity add = MapstructUtils.convert(bo, DmsBillsLubeInstanceActivity.class); // 获取当前登录用户信息 Long userId = LoginHelper.getUserId(); String username = LoginHelper.getUsername(); + add.setHandleTime(DateUtils.getNowDate());/**/ + add.setHandleUserId(userId); + add.setHandleBy(username); -/* TODO:还没用工作流wf,暂时注释掉 */ + +/* fixme:京源的工作流程 */ // 如果当前步骤不是第一步 if (add.getProcessStepOrder() != 1) { // 如果是最后一步，执行结束流程 @@ -222,8 +227,10 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setInstanceActivityId(add.getInstanceActivityId()); + DmsBillsLubeInstanceActivityVo vo = MapstructUtils.convert(add, DmsBillsLubeInstanceActivityVo.class); + return vo; } - return flag; + return null; } /** @@ -233,10 +240,14 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns * @return 是否修改成功 */ @Override - public Boolean updateByBo(DmsBillsLubeInstanceActivityBo bo) { + public DmsBillsLubeInstanceActivityVo updateByBo(DmsBillsLubeInstanceActivityBo bo) { DmsBillsLubeInstanceActivity update = MapstructUtils.convert(bo, DmsBillsLubeInstanceActivity.class); validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + boolean flag = baseMapper.updateById(update) > 0; + if (flag){ + return MapstructUtils.convert(update, DmsBillsLubeInstanceActivityVo.class); + } + return null; } /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java index 38b9f96..503af17 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java @@ -444,8 +444,9 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer if (entity == null) { throw new ServiceException("记录不存在"); } - entity.setWfDefinitionId(wfDefinitionId); // 假设字段已存在于实体中 + entity.setWfDefinitionId(wfDefinitionId); return baseMapper.updateById(entity) > 0; } + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java index c88b909..d6d9e96 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java @@ -29,6 +29,7 @@ import org.dromara.dms.service.IDmsBillsMaintDetailService; import org.dromara.dms.service.IDmsBillsMaintInstanceService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.*; import java.util.stream.Collectors; @@ -382,5 +383,24 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS return 1; } + /** + * 更新保养实例的工作流定义ID + * @param maintInstanceId 保养实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateWfDefinitionIdById(Long maintInstanceId, Long wfDefinitionId) { + if(ObjectUtils.isEmpty(maintInstanceId)){ + throw new ServiceException("参数为空"); + } + DmsBillsMaintInstance entity = baseMapper.selectById(maintInstanceId); + if (entity == null) { + throw new ServiceException("记录不存在"); + } + entity.setWfDefinitionId(wfDefinitionId); + return baseMapper.updateById(entity) > 0; + } } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java new file mode 100644 index 0000000..304e8af --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java @@ -0,0 +1,155 @@ +package org.dromara.dms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.dms.domain.bo.DmsMaintInstanceActivityBo; +import org.dromara.dms.domain.vo.DmsMaintInstanceActivityVo; +import org.dromara.dms.domain.DmsMaintInstanceActivity; +import org.dromara.dms.mapper.DmsMaintInstanceActivityMapper; +import org.dromara.dms.service.IDmsMaintInstanceActivityService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保养工单实例节点;弃用Service业务层处理 + * + * @author zch + * @date 2025-05-19 + */ +@RequiredArgsConstructor +@Service +public class DmsMaintInstanceActivityServiceImpl implements IDmsMaintInstanceActivityService { + + private final DmsMaintInstanceActivityMapper baseMapper; + + /** + * 查询保养工单实例节点;弃用 + * + * @param instanceActivityId 主键 + * @return 保养工单实例节点;弃用 + */ + @Override + public DmsMaintInstanceActivityVo queryById(Long instanceActivityId){ + return baseMapper.selectVoById(instanceActivityId); + } + + /** + * 分页查询保养工单实例节点;弃用列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保养工单实例节点;弃用分页列表 + */ + @Override + public TableDataInfo queryPageList(DmsMaintInstanceActivityBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保养工单实例节点;弃用列表 + * + * @param bo 查询条件 + * @return 保养工单实例节点;弃用列表 + */ + @Override + public List queryList(DmsMaintInstanceActivityBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(DmsMaintInstanceActivityBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsMaintInstanceActivity.class) + .selectAll(DmsMaintInstanceActivity.class) + .eq(bo.getInstanceActivityId() != null, DmsMaintInstanceActivity::getInstanceActivityId, bo.getInstanceActivityId()) + .eq(bo.getMaintInstanceId() != null, DmsMaintInstanceActivity::getMaintInstanceId, bo.getMaintInstanceId()) + .eq(bo.getWfDefinitionId() != null, DmsMaintInstanceActivity::getWfDefinitionId, bo.getWfDefinitionId()) + .eq(bo.getWfNodeId() != null, DmsMaintInstanceActivity::getWfNodeId, bo.getWfNodeId()) + .eq(StringUtils.isNotBlank(bo.getMaintLevel()), DmsMaintInstanceActivity::getMaintLevel, bo.getMaintLevel()) + .eq(StringUtils.isNotBlank(bo.getMaintGroup()), DmsMaintInstanceActivity::getMaintGroup, bo.getMaintGroup()) + .eq(StringUtils.isNotBlank(bo.getMaintSupervisor()), DmsMaintInstanceActivity::getMaintSupervisor, bo.getMaintSupervisor()) + .eq(StringUtils.isNotBlank(bo.getProcessHandleResolution()), DmsMaintInstanceActivity::getProcessHandleResolution, bo.getProcessHandleResolution()) + .eq(StringUtils.isNotBlank(bo.getProcessHandleStatus()), DmsMaintInstanceActivity::getProcessHandleStatus, bo.getProcessHandleStatus()) + .eq(bo.getProcessStepOrder() != null, DmsMaintInstanceActivity::getProcessStepOrder, bo.getProcessStepOrder()) + .eq(bo.getStartTime() != null, DmsMaintInstanceActivity::getStartTime, bo.getStartTime()) + .eq(bo.getEndTime() != null, DmsMaintInstanceActivity::getEndTime, bo.getEndTime()) + .eq(bo.getHandleUserId() != null, DmsMaintInstanceActivity::getHandleUserId, bo.getHandleUserId()) + .eq(StringUtils.isNotBlank(bo.getHandleBy()), DmsMaintInstanceActivity::getHandleBy, bo.getHandleBy()) + .eq(bo.getHandleTime() != null, DmsMaintInstanceActivity::getHandleTime, bo.getHandleTime()) + .eq(bo.getTransferUserId() != null, DmsMaintInstanceActivity::getTransferUserId, bo.getTransferUserId()) + .eq(StringUtils.isNotBlank(bo.getAttr1()), DmsMaintInstanceActivity::getAttr1, bo.getAttr1()) + .orderByDesc(DmsMaintInstanceActivity::getCreateTime); + return lqw; + } + + /** + * 新增保养工单实例节点;弃用 + * + * @param bo 保养工单实例节点;弃用 + * @return 是否新增成功 + */ + @Override + public DmsMaintInstanceActivityVo insertByBo(DmsMaintInstanceActivityBo bo) { + DmsMaintInstanceActivity add = MapstructUtils.convert(bo, DmsMaintInstanceActivity.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInstanceActivityId(add.getInstanceActivityId()); + DmsMaintInstanceActivityVo vo = MapstructUtils.convert(add, DmsMaintInstanceActivityVo.class); + return vo; + } + return null; + } + + /** + * 修改保养工单实例节点;弃用 + * + * @param bo 保养工单实例节点;弃用 + * @return 是否修改成功 + */ + @Override + public DmsMaintInstanceActivityVo updateByBo(DmsMaintInstanceActivityBo bo) { + DmsMaintInstanceActivity update = MapstructUtils.convert(bo, DmsMaintInstanceActivity.class); + validEntityBeforeSave(update); + boolean flag = baseMapper.updateById(update) > 0; + if (flag) { + DmsMaintInstanceActivityVo vo = MapstructUtils.convert(update, DmsMaintInstanceActivityVo.class); + return vo; + } + return null; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DmsMaintInstanceActivity entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除保养工单实例节点;弃用信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRepairInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRepairInstanceServiceImpl.java index 336029b..1167aae 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRepairInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRepairInstanceServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.dms.service.impl; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -15,6 +16,8 @@ import org.dromara.dms.domain.vo.DmsRepairInstanceVo; import org.dromara.dms.domain.DmsRepairInstance; import org.dromara.dms.mapper.DmsRepairInstanceMapper; import org.dromara.dms.service.IDmsRepairInstanceService; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.List; import java.util.Map; @@ -140,4 +143,24 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService { } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 更新检修实例的工作流定义ID + * @param repairInstanceId 检修实例的ID + * @param wfDefinitionId 工作流定义的ID + * @return 如果更新成功返回true，否则返回false + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateWfDefinitionIdById(Long repairInstanceId, Long wfDefinitionId) { + if(ObjectUtils.isEmpty(repairInstanceId)){ + throw new ServiceException("参数为空"); + } + DmsRepairInstance entity = baseMapper.selectById(repairInstanceId); + if (entity == null) { + throw new ServiceException("记录不存在"); + } + entity.setWfDefinitionId(wfDefinitionId); + return baseMapper.updateById(entity) > 0; + } } diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml new file mode 100644 index 0000000..993e946 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml new file mode 100644 index 0000000..d5d8db3 --- /dev/null +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml @@ -0,0 +1,7 @@ + + + + +