From 21fa46f315ddbe63c671f9aa97b9d45421ad4130 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Wed, 30 Apr 2025 15:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=9D=E5=AE=A1=20?= =?UTF-8?q?=E7=BB=88=E5=AE=A1=20=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkOrderInfoController.java | 26 ++ .../controller/WorkReviewInfoController.java | 105 +++++++ .../platform/domain/WorkReviewInfo.java | 124 ++++++++ .../platform/domain/bo/WorkOrderInfoBo.java | 5 + .../platform/domain/bo/WorkReviewInfoBo.java | 134 +++++++++ .../platform/domain/vo/WorkReviewInfoVo.java | 142 +++++++++ .../platform/mapper/WorkReviewInfoMapper.java | 15 + .../service/IWorkOrderInfoService.java | 21 ++ .../service/IWorkReviewInfoService.java | 68 +++++ .../impl/WorkOrderInfoServiceImpl.java | 280 ++++++++++++++++++ .../impl/WorkReviewInfoServiceImpl.java | 145 +++++++++ 11 files changed, 1065 insertions(+) create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkReviewInfo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkReviewInfoBo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkReviewInfoVo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkReviewInfoMapper.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkReviewInfoService.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkReviewInfoServiceImpl.java 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 647c6ff..80388cb 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 @@ -11,6 +11,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import org.apache.ibatis.annotations.Param; import org.dromara.platform.domain.InspectionPlanInfo; import org.dromara.platform.domain.WorkOrderInfo; +import org.dromara.platform.domain.WorkReviewInfo; +import org.dromara.platform.domain.bo.WorkReviewInfoBo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -130,6 +132,30 @@ public class WorkOrderInfoController extends BaseController { return R.ok("处理工单成功!"); } + + @SaCheckPermission("platform:workOrder:rollBackOrder") + @PostMapping("/rollBackOrder") + public R rollBackOrder(@RequestBody WorkOrderInfoBo bo ) { + workOrderInfoService.rollBackOrder(bo); + return R.ok("回退工单成功!"); + } + + + @SaCheckPermission("platform:workOrder:initReviewOrder") + @PostMapping("/initReviewOrder") + public R initReviewOrder(@RequestBody WorkReviewInfoBo bo ) { + workOrderInfoService.initReviewOrder(bo); + return R.ok("初审工单成功!"); + } + + @SaCheckPermission("platform:workOrder:lastReviewOrder") + @PostMapping("/lastReviewOrder") + public R lastReviewOrder(@RequestBody WorkReviewInfoBo bo ) { + workOrderInfoService.lastReviewOrder(bo); + return R.ok("终审工单成功!"); + } + + @SaCheckPermission("platform:workOrder:dealWithList") @GetMapping("/dealWithList") public TableDataInfo dealWithList(WorkOrderInfoBo bo, PageQuery pageQuery) { diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java new file mode 100644 index 0000000..50622ef --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java @@ -0,0 +1,105 @@ +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.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.WorkReviewInfoVo; +import org.dromara.platform.domain.bo.WorkReviewInfoBo; +import org.dromara.platform.service.IWorkReviewInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 工单审批信息 + * + * @author gejunhao + * @date 2025-04-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/reviewInfo") +public class WorkReviewInfoController extends BaseController { + + private final IWorkReviewInfoService workReviewInfoService; + + /** + * 查询工单审批信息列表 + */ + @SaCheckPermission("platform:reviewInfo:list") + @GetMapping("/list") + public TableDataInfo list(WorkReviewInfoBo bo, PageQuery pageQuery) { + return workReviewInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出工单审批信息列表 + */ + @SaCheckPermission("platform:reviewInfo:export") + @Log(title = "工单审批信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WorkReviewInfoBo bo, HttpServletResponse response) { + List list = workReviewInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "工单审批信息", WorkReviewInfoVo.class, response); + } + + /** + * 获取工单审批信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:reviewInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(workReviewInfoService.queryById(id)); + } + + /** + * 新增工单审批信息 + */ + @SaCheckPermission("platform:reviewInfo:add") + @Log(title = "工单审批信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WorkReviewInfoBo bo) { + return toAjax(workReviewInfoService.insertByBo(bo)); + } + + /** + * 修改工单审批信息 + */ + @SaCheckPermission("platform:reviewInfo:edit") + @Log(title = "工单审批信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WorkReviewInfoBo bo) { + return toAjax(workReviewInfoService.updateByBo(bo)); + } + + /** + * 删除工单审批信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:reviewInfo:remove") + @Log(title = "工单审批信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(workReviewInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkReviewInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkReviewInfo.java new file mode 100644 index 0000000..619ddb5 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkReviewInfo.java @@ -0,0 +1,124 @@ +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; + +/** + * 工单审批信息对象 work_review_info + * + * @author gejunhao + * @date 2025-04-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("work_review_info") +public class WorkReviewInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @TableId(value = "id") + private String id; + + /** + * 关联的工单ID + */ + private String workOrderId; + + /** + * 审批人 + */ + private String reviewPeople; + + /** + * 申请人 + */ + private String applyPeople; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 处理结果:通过,退回 + */ + private String handleResult; + + /** + * 接单是否超期 + */ + private String isOrderTakingOvertime; + + /** + * 接单超期扣款 + */ + private Long orderTakingCost; + + /** + * 处理是否超期 + */ + private String isHandleOvertime; + + /** + * 处理超期扣款 + */ + private Long handleCost; + + /** + * 其他扣款费用 + */ + private Long otherCost; + + /** + * 其他扣费原因 + */ + private String otherCostReason; + + /** + * 处理结果描述 + */ + private String auditOpinion; + + /** + * 是否结案:是,否 + */ + private String isCloseCase; + + /** + * 操作时间 + */ + private Date operationTime; + + /** + * 附件 + */ + private String attachment; + + /** + * 当前状态 + */ + private Long status; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} 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 a7ff50b..96567ed 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 @@ -192,4 +192,9 @@ public class WorkOrderInfoBo extends BaseEntity { */ private Long cost; + /** + * 回退原因 + */ + private String backReason; + } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkReviewInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkReviewInfoBo.java new file mode 100644 index 0000000..4fb8fd1 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkReviewInfoBo.java @@ -0,0 +1,134 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.WorkReviewInfo; +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_review_info + * + * @author gejunhao + * @date 2025-04-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WorkReviewInfo.class, reverseConvertGenerate = false) +public class WorkReviewInfoBo 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 reviewPeople; + + /** + * 申请人 + */ + //@NotBlank(message = "申请人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String applyPeople; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 合同名称 + */ + @NotBlank(message = "合同名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contractName; + + /** + * 处理结果:通过,退回 + */ + @NotBlank(message = "处理结果:通过,退回不能为空", groups = { AddGroup.class, EditGroup.class }) + private String handleResult; + + /** + * 接单是否超期 + */ + //@NotBlank(message = "接单是否超期不能为空", groups = { AddGroup.class, EditGroup.class }) + private String isOrderTakingOvertime; + + /** + * 接单超期扣款 + */ + //@NotNull(message = "接单超期扣款不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderTakingCost; + + /** + * 处理是否超期 + */ + //@NotBlank(message = "处理是否超期不能为空", groups = { AddGroup.class, EditGroup.class }) + private String isHandleOvertime; + + /** + * 处理超期扣款 + */ + //@NotNull(message = "处理超期扣款不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long handleCost; + + /** + * 其他扣款费用 + */ + //@NotNull(message = "其他扣款费用不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long otherCost; + + /** + * 其他扣费原因 + */ + //@NotBlank(message = "其他扣费原因不能为空", groups = { AddGroup.class, EditGroup.class }) + private String otherCostReason; + + /** + * 处理结果描述 + */ + //@NotBlank(message = "处理结果描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String auditOpinion; + + /** + * 是否结案:是,否 + */ + @NotBlank(message = "是否结案:是,否不能为空", groups = { AddGroup.class, EditGroup.class }) + private String isCloseCase; + + /** + * 操作时间 + */ + //@NotNull(message = "操作时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date operationTime; + + /** + * 附件 + */ + //@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/vo/WorkReviewInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkReviewInfoVo.java new file mode 100644 index 0000000..60eb01c --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkReviewInfoVo.java @@ -0,0 +1,142 @@ +package org.dromara.platform.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.platform.domain.WorkReviewInfo; +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; + + + +/** + * 工单审批信息视图对象 work_review_info + * + * @author gejunhao + * @date 2025-04-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WorkReviewInfo.class) +public class WorkReviewInfoVo 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 reviewPeople; + + /** + * 申请人 + */ + @ExcelProperty(value = "申请人") + private String applyPeople; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; + + /** + * 处理结果:通过,退回 + */ + @ExcelProperty(value = "处理结果:通过,退回") + private String handleResult; + + /** + * 接单是否超期 + */ + @ExcelProperty(value = "接单是否超期") + private String isOrderTakingOvertime; + + /** + * 接单超期扣款 + */ + @ExcelProperty(value = "接单超期扣款") + private Long orderTakingCost; + + /** + * 处理是否超期 + */ + @ExcelProperty(value = "处理是否超期") + private String isHandleOvertime; + + /** + * 处理超期扣款 + */ + @ExcelProperty(value = "处理超期扣款") + private Long handleCost; + + /** + * 其他扣款费用 + */ + @ExcelProperty(value = "其他扣款费用") + private Long otherCost; + + /** + * 其他扣费原因 + */ + @ExcelProperty(value = "其他扣费原因") + private String otherCostReason; + + /** + * 处理结果描述 + */ + @ExcelProperty(value = "处理结果描述") + private String auditOpinion; + + /** + * 是否结案:是,否 + */ + @ExcelProperty(value = "是否结案:是,否") + private String isCloseCase; + + /** + * 操作时间 + */ + @ExcelProperty(value = "操作时间") + private Date operationTime; + + /** + * 附件 + */ + @ExcelProperty(value = "附件") + private String attachment; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkReviewInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkReviewInfoMapper.java new file mode 100644 index 0000000..e71205c --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkReviewInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.WorkReviewInfo; +import org.dromara.platform.domain.vo.WorkReviewInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工单审批信息Mapper接口 + * + * @author gejunhao + * @date 2025-04-30 + */ +public interface WorkReviewInfoMapper extends BaseMapperPlus { + +} 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 39ff0fd..6ea3ee8 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 @@ -2,6 +2,8 @@ package org.dromara.platform.service; import org.dromara.platform.domain.InspectionPlanInfo; import org.dromara.platform.domain.WorkOrderInfo; +import org.dromara.platform.domain.WorkReviewInfo; +import org.dromara.platform.domain.bo.WorkReviewInfoBo; import org.dromara.platform.domain.vo.WorkOrderInfoVo; import org.dromara.platform.domain.bo.WorkOrderInfoBo; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -94,4 +96,23 @@ public interface IWorkOrderInfoService { * @param bo */ void dealOrder(WorkOrderInfoBo bo); + + + /** + * 初审工单 + * @param bo + */ + void initReviewOrder(WorkReviewInfoBo bo); + + /** + * 终审工单 + * @param bo + */ + void lastReviewOrder(WorkReviewInfoBo bo); + + /** + * 回退工单 + * @param bo + */ + void rollBackOrder(WorkOrderInfoBo bo); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkReviewInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkReviewInfoService.java new file mode 100644 index 0000000..98c4740 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkReviewInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.WorkReviewInfoVo; +import org.dromara.platform.domain.bo.WorkReviewInfoBo; +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-30 + */ +public interface IWorkReviewInfoService { + + /** + * 查询工单审批信息 + * + * @param id 主键 + * @return 工单审批信息 + */ + WorkReviewInfoVo queryById(String id); + + /** + * 分页查询工单审批信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工单审批信息分页列表 + */ + TableDataInfo queryPageList(WorkReviewInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的工单审批信息列表 + * + * @param bo 查询条件 + * @return 工单审批信息列表 + */ + List queryList(WorkReviewInfoBo bo); + + /** + * 新增工单审批信息 + * + * @param bo 工单审批信息 + * @return 是否新增成功 + */ + Boolean insertByBo(WorkReviewInfoBo bo); + + /** + * 修改工单审批信息 + * + * @param bo 工单审批信息 + * @return 是否修改成功 + */ + Boolean updateByBo(WorkReviewInfoBo bo); + + /** + * 校验并批量删除工单审批信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} 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 9c711ae..52d3df8 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 @@ -16,10 +16,12 @@ 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.domain.bo.WorkReviewInfoBo; 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.platform.service.IWorkReviewInfoService; import org.dromara.workflow.domain.bo.StartProcessBo; import org.dromara.workflow.domain.bo.TaskBo; import org.dromara.workflow.domain.bo.TestLeaveBo; @@ -62,6 +64,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { @Resource private WorkDealInfoMapper workDealInfoMapper; + @Resource + private IWorkReviewInfoService workReviewInfoService; + /** * 查询工单信息 * @@ -518,6 +523,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { long durationInSeconds = duration.getSeconds(); String formatDuration = formatDuration((int) durationInSeconds); workOrderProcess.setDuration(formatDuration); + Boolean flag = workOrderProcessService.insertByBo(workOrderProcess); if (flag){ @@ -528,4 +534,278 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { log.info("工单处理完毕,等待初审结果"); } } + + @Override + public void initReviewOrder(WorkReviewInfoBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + // 1.插入审核信息表 + workReviewInfoService.insertByBo(bo); + // 2.根据处理结果判断 + String handleResult = bo.getHandleResult(); + String workOrderId = bo.getId(); + + if (handleResult.equals("通过")){ + 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); + workOrderProcess.setFeedback(bo.getHandleResult()); + // 计算时间差 + 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, 5); + baseMapper.update(null, updateWrapper); + log.info("工单处理完毕,等待终审结果"); + } + }else { + 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); + workOrderProcess.setFeedback(bo.getHandleResult()); + // 计算时间差 + 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("运维单位处理时回退至派遣,等待再次初审"); + } + } + + String isCloseCase = bo.getIsCloseCase(); + if ("是".equals(isCloseCase)){ + 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); + // 设置处理结果 + workOrderProcess.setFeedback(bo.getHandleResult()); + // 计算时间差 + 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, 6); + baseMapper.update(null, updateWrapper); + log.info("结案"); + } + }else if ("否".equals(isCloseCase)){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(WorkOrderInfo::getId, workOrderId) + //初审通过等待终审 + .set(WorkOrderInfo::getStatus, 5); + baseMapper.update(null, updateWrapper); + log.info("等待终审"); + } + + } + + + + @Override + public void lastReviewOrder(WorkReviewInfoBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + // 1.插入审核信息表 + workReviewInfoService.insertByBo(bo); + // 2.根据处理结果判断 + String handleResult = bo.getHandleResult(); + String workOrderId = bo.getId(); + + if (handleResult.equals("通过")){ + 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); + workOrderProcess.setFeedback(bo.getHandleResult()); + // 计算时间差 + 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, 6); + baseMapper.update(null, updateWrapper); + log.info("结案"); + WorkOrderProcessBo endBo = new WorkOrderProcessBo(); + endBo.setWorkOrderId(workOrderId); + endBo.setOperator(loginUser.getNickname()); + endBo.setStage("结案"); + endBo.setOperationName("结案"); + endBo.setDescription("结案"); + endBo.setOperationTime(date2); + endBo.setOperator(loginUser.getNickname()); + workOrderProcessService.insertByBo(endBo); + } + }else { + 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); + workOrderProcess.setFeedback(bo.getHandleResult()); + // 计算时间差 + 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 void rollBackOrder(WorkOrderInfoBo bo) { + // 1.创建处理信息 + LoginUser loginUser = LoginHelper.getLoginUser(); + 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.getBackReason()); + // 计算时间差 + 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, 3); + baseMapper.update(null, updateWrapper); + log.info("运维单位处理时回退至派遣完毕,等待初审结果"); + } + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkReviewInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkReviewInfoServiceImpl.java new file mode 100644 index 0000000..ed2f362 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkReviewInfoServiceImpl.java @@ -0,0 +1,145 @@ +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.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.WorkReviewInfoBo; +import org.dromara.platform.domain.vo.WorkReviewInfoVo; +import org.dromara.platform.domain.WorkReviewInfo; +import org.dromara.platform.mapper.WorkReviewInfoMapper; +import org.dromara.platform.service.IWorkReviewInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 工单审批信息Service业务层处理 + * + * @author gejunhao + * @date 2025-04-30 + */ +@RequiredArgsConstructor +@Service +public class WorkReviewInfoServiceImpl implements IWorkReviewInfoService { + + private final WorkReviewInfoMapper baseMapper; + + /** + * 查询工单审批信息 + * + * @param id 主键 + * @return 工单审批信息 + */ + @Override + public WorkReviewInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询工单审批信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工单审批信息分页列表 + */ + @Override + public TableDataInfo queryPageList(WorkReviewInfoBo 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(WorkReviewInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WorkReviewInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getWorkOrderId()), WorkReviewInfo::getWorkOrderId, bo.getWorkOrderId()); + lqw.eq(StringUtils.isNotBlank(bo.getReviewPeople()), WorkReviewInfo::getReviewPeople, bo.getReviewPeople()); + lqw.eq(StringUtils.isNotBlank(bo.getApplyPeople()), WorkReviewInfo::getApplyPeople, bo.getApplyPeople()); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), WorkReviewInfo::getProjectName, bo.getProjectName()); + lqw.like(StringUtils.isNotBlank(bo.getContractName()), WorkReviewInfo::getContractName, bo.getContractName()); + lqw.eq(StringUtils.isNotBlank(bo.getHandleResult()), WorkReviewInfo::getHandleResult, bo.getHandleResult()); + lqw.eq(StringUtils.isNotBlank(bo.getIsOrderTakingOvertime()), WorkReviewInfo::getIsOrderTakingOvertime, bo.getIsOrderTakingOvertime()); + lqw.eq(bo.getOrderTakingCost() != null, WorkReviewInfo::getOrderTakingCost, bo.getOrderTakingCost()); + lqw.eq(StringUtils.isNotBlank(bo.getIsHandleOvertime()), WorkReviewInfo::getIsHandleOvertime, bo.getIsHandleOvertime()); + lqw.eq(bo.getHandleCost() != null, WorkReviewInfo::getHandleCost, bo.getHandleCost()); + lqw.eq(bo.getOtherCost() != null, WorkReviewInfo::getOtherCost, bo.getOtherCost()); + lqw.eq(StringUtils.isNotBlank(bo.getOtherCostReason()), WorkReviewInfo::getOtherCostReason, bo.getOtherCostReason()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditOpinion()), WorkReviewInfo::getAuditOpinion, bo.getAuditOpinion()); + lqw.eq(StringUtils.isNotBlank(bo.getIsCloseCase()), WorkReviewInfo::getIsCloseCase, bo.getIsCloseCase()); + lqw.eq(bo.getOperationTime() != null, WorkReviewInfo::getOperationTime, bo.getOperationTime()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WorkReviewInfo::getAttachment, bo.getAttachment()); + lqw.eq(bo.getStatus() != null, WorkReviewInfo::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增工单审批信息 + * + * @param bo 工单审批信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WorkReviewInfoBo bo) { + WorkReviewInfo add = MapstructUtils.convert(bo, WorkReviewInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改工单审批信息 + * + * @param bo 工单审批信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WorkReviewInfoBo bo) { + WorkReviewInfo update = MapstructUtils.convert(bo, WorkReviewInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WorkReviewInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除工单审批信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}