diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java new file mode 100644 index 0000000..e23b26b --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java @@ -0,0 +1,113 @@ +package org.dromara.platform.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.apache.ibatis.annotations.Param; +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.platform.domain.vo.WorkDealInfoVo; +import org.dromara.platform.domain.bo.WorkDealInfoBo; +import org.dromara.platform.service.IWorkDealInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 工单处理信息 + * + * @author gejunhao + * @date 2025-04-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/dealInfo") +public class WorkDealInfoController extends BaseController { + + private final IWorkDealInfoService workDealInfoService; + + /** + * 查询工单处理信息列表 + */ + @SaCheckPermission("platform:dealInfo:list") + @GetMapping("/list") + public TableDataInfo list(WorkDealInfoBo bo, PageQuery pageQuery) { + return workDealInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出工单处理信息列表 + */ + @SaCheckPermission("platform:dealInfo:export") + @Log(title = "工单处理信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WorkDealInfoBo bo, HttpServletResponse response) { + List list = workDealInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "工单处理信息", WorkDealInfoVo.class, response); + } + + /** + * 获取工单处理信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:dealInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(workDealInfoService.queryById(id)); + } + + /** + * 新增工单处理信息 + */ + @SaCheckPermission("platform:dealInfo:add") + @Log(title = "工单处理信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WorkDealInfoBo bo) { + return toAjax(workDealInfoService.insertByBo(bo)); + } + + /** + * 修改工单处理信息 + */ + @SaCheckPermission("platform:dealInfo:edit") + @Log(title = "工单处理信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WorkDealInfoBo bo) { + return toAjax(workDealInfoService.updateByBo(bo)); + } + + /** + * 删除工单处理信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:dealInfo:remove") + @Log(title = "工单处理信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(workDealInfoService.deleteWithValidByIds(List.of(ids), true)); + } + + @SaCheckPermission("platform:dealInfo:query") + @GetMapping("/getInfoByOrderId") + public R getInfoByOrderId(@Param("workOrderId") String workOrderId) { + WorkDealInfoVo rs = workDealInfoService.getInfoByOrderId(workOrderId); + return R.ok(rs); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java index 946535b..647c6ff 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java @@ -116,9 +116,31 @@ public class WorkOrderInfoController extends BaseController { } @SaCheckPermission("platform:workOrder:takeOrder") - @PostMapping("/takeOrder") - public R createOrders(String workOrderId ) { + @GetMapping("/takeOrder") + public R takeOrder(String workOrderId ) { workOrderInfoService.takeOrder(workOrderId); return R.ok("接单成功!"); } + + + @SaCheckPermission("platform:workOrder:dealOrder") + @PostMapping("/dealOrder") + public R dealOrder(@RequestBody WorkOrderInfoBo bo ) { + workOrderInfoService.dealOrder(bo); + return R.ok("处理工单成功!"); + } + + @SaCheckPermission("platform:workOrder:dealWithList") + @GetMapping("/dealWithList") + public TableDataInfo dealWithList(WorkOrderInfoBo bo, PageQuery pageQuery) { + TableDataInfo rs = workOrderInfoService.dealWithList(bo, pageQuery); + return rs; + } + + @SaCheckPermission("platform:workOrder:reviewList") + @GetMapping("/reviewList") + public TableDataInfo reviewList(WorkOrderInfoBo bo, PageQuery pageQuery) { + TableDataInfo rs = workOrderInfoService.reviewList(bo, pageQuery); + return rs; + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java index 24f20ae..e320694 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java @@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.platform.domain.vo.ContractSelectVo; +import org.dromara.platform.domain.vo.WorkOrderHistoryVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -112,4 +113,11 @@ public class WorkOrderProcessController extends BaseController { List rs = workOrderProcessService.queryList(bo); return R.ok(rs); } + + @SaCheckPermission("platform:orderProcess:historyInfo") + @GetMapping("/historyInfo") + public R> historyInfo(WorkOrderProcessBo bo) { + List rs = workOrderProcessService.historyInfo(bo); + return R.ok(rs); + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkDealInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkDealInfo.java new file mode 100644 index 0000000..2a2db3f --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkDealInfo.java @@ -0,0 +1,77 @@ +package org.dromara.platform.domain; + +import org.dromara.common.tenant.core.TenantEntity; +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; +import java.util.List; + +/** + * 工单处理信息对象 work_deal_info + * + * @author gejunhao + * @date 2025-04-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("work_deal_info") +public class WorkDealInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @TableId(value = "id") + private String id; + + /** + * 关联的工单ID + */ + private String workOrderId; + + /** + * 维修人员 + */ + private String fixPeople; + + /** + * 修复时间 + */ + private Date fixTime; + + /** + * 修复结果 + */ + private String fixResult; + + /** + * 费用情况 + */ + private Long cost; + + /** + * 故障图片 + */ + private String attachment; + + /** + * 当前状态 + */ + private Long status; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + @TableField(exist = false) + private List attachments; + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java index f3b0f13..7001bdb 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java @@ -140,6 +140,13 @@ public class WorkOrderInfo extends TenantEntity { /** * 当前状态 + * 0 待派遣 + * 1 待接单 + * 2 处理中 + * 3 运维单位处理时回退至派遣 + * 4 初审 + * 5 终审 + * 6 结案 */ private Long status; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkDealInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkDealInfoBo.java new file mode 100644 index 0000000..8e11f1c --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkDealInfoBo.java @@ -0,0 +1,74 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.WorkDealInfo; +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; + +/** + * 工单处理信息业务对象 work_deal_info + * + * @author gejunhao + * @date 2025-04-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WorkDealInfo.class, reverseConvertGenerate = false) +public class WorkDealInfoBo extends BaseEntity { + + /** + * 唯一标识符 + */ + @NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 关联的工单ID + */ + @NotBlank(message = "关联的工单ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String workOrderId; + + /** + * 维修人员 + */ + @NotBlank(message = "维修人员不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fixPeople; + + /** + * 修复时间 + */ + @NotNull(message = "修复时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date fixTime; + + /** + * 修复结果 + */ + @NotBlank(message = "修复结果不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fixResult; + + /** + * 费用情况 + */ + @NotNull(message = "费用情况不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long cost; + + /** + * 故障图片 + */ + @NotBlank(message = "故障图片不能为空", groups = { AddGroup.class, EditGroup.class }) + private String attachment; + + /** + * 当前状态 + */ + @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java index 2546ba8..a7ff50b 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java @@ -38,13 +38,13 @@ public class WorkOrderInfoBo extends BaseEntity { /** * 所属项目 */ - @NotBlank(message = "所属项目不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "所属项目不能为空", groups = { AddGroup.class, EditGroup.class }) private String projectName; /** * 合同名称 */ - @NotBlank(message = "合同名称不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "合同名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String contractName; /** @@ -181,4 +181,15 @@ public class WorkOrderInfoBo extends BaseEntity { //@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; + + /** + * 修复结果 + */ + private String fixResult; + + /** + * 费用情况 + */ + private Long cost; + } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkDealInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkDealInfoVo.java new file mode 100644 index 0000000..ca6044e --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkDealInfoVo.java @@ -0,0 +1,86 @@ +package org.dromara.platform.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.platform.domain.Attachment; +import org.dromara.platform.domain.WorkDealInfo; +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; +import java.util.List; + + +/** + * 工单处理信息视图对象 work_deal_info + * + * @author gejunhao + * @date 2025-04-29 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WorkDealInfo.class) +public class WorkDealInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @ExcelProperty(value = "唯一标识符") + private String id; + + /** + * 关联的工单ID + */ + @ExcelProperty(value = "关联的工单ID") + private String workOrderId; + + /** + * 维修人员 + */ + @ExcelProperty(value = "维修人员") + private String fixPeople; + + /** + * 修复时间 + */ + @ExcelProperty(value = "修复时间") + private Date fixTime; + + /** + * 修复结果 + */ + @ExcelProperty(value = "修复结果") + private String fixResult; + + /** + * 费用情况 + */ + @ExcelProperty(value = "费用情况") + private Long cost; + + /** + * 故障图片 + */ + @ExcelProperty(value = "故障图片") + private String attachment; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + /** + * 附件信息 + */ + List attachments; +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderHistoryVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderHistoryVo.java new file mode 100644 index 0000000..0a7bf82 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderHistoryVo.java @@ -0,0 +1,42 @@ +package org.dromara.platform.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; +@Data +public class WorkOrderHistoryVo { + @ExcelProperty(value = "关联的工单ID") + private String workOrderId; + + /** + * 操作人 + */ + @ExcelProperty(value = "操作人") + private String operator; + + /** + * 操作时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ExcelProperty(value = "操作时间") + private Date operationTime; + + /** + * 用时（单位：秒） + */ + //private String duration; + + /** + * 环节 + */ + @ExcelProperty(value = "环节") + private String stage; + + /** + * 操作名称 + */ + @ExcelProperty(value = "操作名称") + private String operationName; +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java index 89dc259..a631124 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java @@ -174,6 +174,13 @@ public class WorkOrderInfoVo implements Serializable { /** * 当前状态 + * 0 待派遣 + * 1 待接单 + * 2 处理中 + * 3 运维单位处理时回退至派遣 + * 4 初审 + * 5 终审 + * 6 结案 */ @ExcelProperty(value = "当前状态") private Long status; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkDealInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkDealInfoMapper.java new file mode 100644 index 0000000..4eaedec --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkDealInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.WorkDealInfo; +import org.dromara.platform.domain.vo.WorkDealInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工单处理信息Mapper接口 + * + * @author gejunhao + * @date 2025-04-29 + */ +public interface WorkDealInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkDealInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkDealInfoService.java new file mode 100644 index 0000000..0434754 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkDealInfoService.java @@ -0,0 +1,75 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.WorkDealInfoVo; +import org.dromara.platform.domain.bo.WorkDealInfoBo; +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 gejunhao + * @date 2025-04-29 + */ +public interface IWorkDealInfoService { + + /** + * 查询工单处理信息 + * + * @param id 主键 + * @return 工单处理信息 + */ + WorkDealInfoVo queryById(String id); + + /** + * 分页查询工单处理信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工单处理信息分页列表 + */ + TableDataInfo queryPageList(WorkDealInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的工单处理信息列表 + * + * @param bo 查询条件 + * @return 工单处理信息列表 + */ + List queryList(WorkDealInfoBo bo); + + /** + * 新增工单处理信息 + * + * @param bo 工单处理信息 + * @return 是否新增成功 + */ + Boolean insertByBo(WorkDealInfoBo bo); + + /** + * 修改工单处理信息 + * + * @param bo 工单处理信息 + * @return 是否修改成功 + */ + Boolean updateByBo(WorkDealInfoBo bo); + + /** + * 校验并批量删除工单处理信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据工单ID查询工单处理信息 + * @param workOrderId + * @return + */ + WorkDealInfoVo getInfoByOrderId(String workOrderId); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java index f9126b0..39ff0fd 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java @@ -71,4 +71,27 @@ public interface IWorkOrderInfoService { List createOrders(InspectionPlanInfo inspectionPlanInfo); void takeOrder(String workOrderId); + + /** + * 工单处理分页查询 + * @param bo + * @param pageQuery + * @return + */ + TableDataInfo dealWithList(WorkOrderInfoBo bo, PageQuery pageQuery); + + /** + * 工单审核分页查询 + * @param bo + * @param pageQuery + * @return + */ + TableDataInfo reviewList(WorkOrderInfoBo bo, PageQuery pageQuery); + + + /** + * 工单处理 + * @param bo + */ + void dealOrder(WorkOrderInfoBo bo); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderProcessService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderProcessService.java index 5db9e41..81a40fe 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderProcessService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderProcessService.java @@ -1,5 +1,6 @@ package org.dromara.platform.service; +import org.dromara.platform.domain.vo.WorkOrderHistoryVo; import org.dromara.platform.domain.vo.WorkOrderProcessVo; import org.dromara.platform.domain.bo.WorkOrderProcessBo; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -65,4 +66,12 @@ public interface IWorkOrderProcessService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + /** + * 工单历史信息 + * @param bo + * @return + */ + List historyInfo(WorkOrderProcessBo bo); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkDealInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkDealInfoServiceImpl.java new file mode 100644 index 0000000..013f084 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkDealInfoServiceImpl.java @@ -0,0 +1,161 @@ +package org.dromara.platform.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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.platform.domain.Attachment; +import org.dromara.platform.domain.AttachmentSerializer; +import org.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.WorkDealInfoBo; +import org.dromara.platform.domain.vo.WorkDealInfoVo; +import org.dromara.platform.domain.WorkDealInfo; +import org.dromara.platform.mapper.WorkDealInfoMapper; +import org.dromara.platform.service.IWorkDealInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 工单处理信息Service业务层处理 + * + * @author gejunhao + * @date 2025-04-29 + */ +@RequiredArgsConstructor +@Service +public class WorkDealInfoServiceImpl implements IWorkDealInfoService { + + private final WorkDealInfoMapper baseMapper; + + /** + * 查询工单处理信息 + * + * @param id 主键 + * @return 工单处理信息 + */ + @Override + public WorkDealInfoVo queryById(String id){ + WorkDealInfoVo workDealInfoVo = baseMapper.selectVoById(id); + String attachment = workDealInfoVo.getAttachment(); + // 封装返回附件信息 + if (StringUtils.isNotBlank(attachment)) { + AttachmentSerializer serializer = new AttachmentSerializer(); + List attachments = serializer.deserializeAttachments(attachment); + workDealInfoVo.setAttachments(attachments); + } + return workDealInfoVo; + } + + /** + * 分页查询工单处理信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工单处理信息分页列表 + */ + @Override + public TableDataInfo queryPageList(WorkDealInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的工单处理信息列表 + * + * @param bo 查询条件 + * @return 工单处理信息列表 + */ + @Override + public List queryList(WorkDealInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WorkDealInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getWorkOrderId()), WorkDealInfo::getWorkOrderId, bo.getWorkOrderId()); + lqw.eq(StringUtils.isNotBlank(bo.getFixResult()), WorkDealInfo::getFixResult, bo.getFixResult()); + lqw.eq(bo.getCost() != null, WorkDealInfo::getCost, bo.getCost()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WorkDealInfo::getAttachment, bo.getAttachment()); + lqw.eq(bo.getStatus() != null, WorkDealInfo::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增工单处理信息 + * + * @param bo 工单处理信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WorkDealInfoBo bo) { + WorkDealInfo add = MapstructUtils.convert(bo, WorkDealInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改工单处理信息 + * + * @param bo 工单处理信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WorkDealInfoBo bo) { + WorkDealInfo update = MapstructUtils.convert(bo, WorkDealInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WorkDealInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除工单处理信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public WorkDealInfoVo getInfoByOrderId(String workOrderId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(WorkDealInfo::getWorkOrderId, workOrderId); + WorkDealInfo workDealInfo = baseMapper.selectOne(queryWrapper); + String attachment = workDealInfo.getAttachment(); + + // 封装返回附件信息 + if (StringUtils.isNotBlank(attachment)) { + AttachmentSerializer serializer = new AttachmentSerializer(); + List attachments = serializer.deserializeAttachments(attachment); + workDealInfo.setAttachments(attachments); + } + WorkDealInfoVo workDealInfoVo = new WorkDealInfoVo(); + MapstructUtils.convert(workDealInfo, workDealInfoVo); + return workDealInfoVo; + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java index bfa1306..5a18460 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.platform.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; @@ -19,6 +20,8 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.platform.domain.*; import org.dromara.platform.domain.bo.WorkOrderProcessBo; +import org.dromara.platform.mapper.WorkDealInfoMapper; +import org.dromara.platform.mapper.WorkOrderProcessMapper; import org.dromara.platform.service.IProjectInfoService; import org.dromara.platform.service.IWorkOrderProcessService; import org.dromara.workflow.domain.bo.StartProcessBo; @@ -28,6 +31,7 @@ import org.dromara.workflow.domain.vo.TaskVo; import org.dromara.workflow.domain.vo.TestLeaveVo; import org.flowable.engine.RuntimeService; import org.flowable.engine.runtime.ProcessInstance; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.platform.domain.bo.WorkOrderInfoBo; @@ -40,6 +44,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; +import java.util.stream.Collectors; /** * 工单信息Service业务层处理 @@ -58,6 +63,11 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { private IProjectInfoService projectInfoService; @Resource private IWorkOrderProcessService workOrderProcessService; + @Resource + private WorkOrderProcessMapper workOrderProcessMapper; + @Resource + private WorkDealInfoMapper workDealInfoMapper; + /** * 查询工单信息 * @@ -323,8 +333,124 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { @Override public void takeOrder(String workOrderId) { + // 1.获取当前用户登录信息 LoginUser loginUser = LoginHelper.getLoginUser(); - String userNickname = loginUser.getNickname(); + WorkOrderProcessBo workOrderProcess = new WorkOrderProcessBo(); + // 2.设置基础信息 + workOrderProcess.setWorkOrderId(workOrderId); + workOrderProcess.setOperator(loginUser.getNickname()); + workOrderProcess.setStage("故障接单"); + workOrderProcess.setOperationName("故障接单"); + workOrderProcess.setDescription("在故障接单环节进行了故障接单操作"); + // 3.获取最近一个节点的操作时间 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(WorkOrderProcess::getWorkOrderId, workOrderId) + .orderByDesc(WorkOrderProcess::getOperationTime) + .last("LIMIT 1"); + WorkOrderProcess recentTarget = workOrderProcessMapper.selectOne(wrapper); + log.info("最近一个节点:{}-->操作时间{}",recentTarget.getOperationName(), recentTarget.getOperationTime()); + Date lastTime = recentTarget.getOperationTime(); + LocalDateTime time1 = LocalDateTime.ofInstant(lastTime.toInstant(), ZoneId.systemDefault()); + // 4.设置操作时间 + LocalDateTime time2 = LocalDateTime.now(); + Date date2 = Date.from(time2.atZone(ZoneId.systemDefault()).toInstant()); + workOrderProcess.setOperationTime(date2); + + workOrderProcess.setFeedback(""); + // 5.计算时间差 + Duration duration = Duration.between(time1, time2); + long durationInSeconds = duration.getSeconds(); + String formatDuration = formatDuration((int) durationInSeconds); + workOrderProcess.setDuration(formatDuration); + Boolean flag = workOrderProcessService.insertByBo(workOrderProcess); + + if (flag){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(WorkOrderInfo::getId, workOrderId) + .set(WorkOrderInfo::getStatus, 2); + baseMapper.update(null, updateWrapper); + log.info("更新工单状态:处理中"); + } + } + + @Override + public TableDataInfo dealWithList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + List filterRecords = records.stream() + .filter(record -> record.getStatus() != null && record.getStatus() < 4) + .collect(Collectors.toList()); + result.setRecords(filterRecords); + return TableDataInfo.build(result); + } + @Override + public TableDataInfo reviewList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + List filterRecords = records.stream() + .filter(record -> record.getStatus() != null && record.getStatus() >= 4) + .collect(Collectors.toList()); + result.setRecords(filterRecords); + return TableDataInfo.build(result); + } + + @Override + public void dealOrder(WorkOrderInfoBo bo) { + // 1.创建处理信息 + LoginUser loginUser = LoginHelper.getLoginUser(); + WorkDealInfo workDealInfo = new WorkDealInfo(); + BeanUtils.copyProperties(bo, workDealInfo,"id"); + // 2.封装信息 + List attachments = bo.getAttachments(); + AttachmentSerializer serializer = new AttachmentSerializer(); + String serializedAttachment = serializer.serializeAttachments(attachments); + workDealInfo.setAttachment(serializedAttachment); + workDealInfo.setFixPeople(loginUser.getNickname()); + workDealInfo.setFixTime(new Date()); + workDealInfo.setWorkOrderId(bo.getId()); + // 3.创建处理信息 + workDealInfoMapper.insert(workDealInfo); + + // 4.创建流程信息 + String workOrderId = bo.getId(); + WorkOrderProcessBo workOrderProcess = new WorkOrderProcessBo(); + // 设置基础信息 + workOrderProcess.setWorkOrderId(workOrderId); + workOrderProcess.setOperator(loginUser.getNickname()); + workOrderProcess.setStage("故障处理"); + workOrderProcess.setOperationName("故障处理"); + workOrderProcess.setDescription("在故障处理环节进行了故障处理操作"); + // 获取最近一个节点的操作时间 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(WorkOrderProcess::getWorkOrderId, workOrderId) + .orderByDesc(WorkOrderProcess::getOperationTime) + .last("LIMIT 1"); + WorkOrderProcess recentTarget = workOrderProcessMapper.selectOne(wrapper); + log.info("最近一个节点:{}-->操作时间{}",recentTarget.getOperationName(), recentTarget.getOperationTime()); + Date lastTime = recentTarget.getOperationTime(); + LocalDateTime time1 = LocalDateTime.ofInstant(lastTime.toInstant(), ZoneId.systemDefault()); + // 设置操作时间 + LocalDateTime time2 = LocalDateTime.now(); + Date date2 = Date.from(time2.atZone(ZoneId.systemDefault()).toInstant()); + workOrderProcess.setOperationTime(date2); + // TODO 处理反馈信息 从表单中获取 + workOrderProcess.setFeedback(bo.getFixResult()); + // 计算时间差 + Duration duration = Duration.between(time1, time2); + long durationInSeconds = duration.getSeconds(); + String formatDuration = formatDuration((int) durationInSeconds); + workOrderProcess.setDuration(formatDuration); + Boolean flag = workOrderProcessService.insertByBo(workOrderProcess); + + if (flag){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(WorkOrderInfo::getId, workOrderId) + .set(WorkOrderInfo::getStatus, 4); + baseMapper.update(null, updateWrapper); + log.info("工单处理完毕,等待初审结果"); + } } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderProcessServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderProcessServiceImpl.java index 4094047..d65d51f 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderProcessServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderProcessServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.platform.domain.vo.DailyInspectionReportVo; +import org.dromara.platform.domain.vo.WorkOrderHistoryVo; import org.springframework.stereotype.Service; import org.dromara.platform.domain.bo.WorkOrderProcessBo; import org.dromara.platform.domain.vo.WorkOrderProcessVo; @@ -16,10 +17,7 @@ import org.dromara.platform.domain.WorkOrderProcess; import org.dromara.platform.mapper.WorkOrderProcessMapper; import org.dromara.platform.service.IWorkOrderProcessService; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; import java.util.stream.Collectors; /** @@ -148,6 +146,21 @@ public class WorkOrderProcessServiceImpl implements IWorkOrderProcessService { return baseMapper.deleteByIds(ids) > 0; } + /** + * 历史信息 (废弃暂时不用) + * @param bo + * @return + */ + @Override + public List historyInfo(WorkOrderProcessBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List workOrderProcessVos = baseMapper.selectVoList(lqw); + // 按照操作时间排序 + List sortedRecords = workOrderProcessVos.stream() + .sorted(Comparator.comparing(WorkOrderProcessVo::getOperationTime)) + .collect(Collectors.toList()); + return new ArrayList<>(); + } }