feat(qms): 集成工作流并优化文件上传

- 在不合格评审中集成工作流功能，添加流程实例ID等字段
- 实现文件上传功能，支持多文件上传并保存到OSS
- 优化不合格评审的审批流程，增加任务完成接口
- 不合格品评审新增主管审批接口

ruoyi-modules/hwmom-dms/pom.xml

@@ -186,7 +186,7 @@
             <version>2.2.2</version>
             <scope>compile</scope>
             <exclusions>
-                <!-- 排除消息总线依赖，DMS模块不需要 -->
+                <!-- 排除消息总线依赖，DMS模块不需要，否则会一直引入本地的Kafka -->
                 <exclusion>
                     <groupId>org.dromara</groupId>
                     <artifactId>ruoyi-common-bus</artifactId>

ruoyi-modules/hwmom-qms/pom.xml

@@ -117,6 +117,7 @@
             <version>2.2.2</version>
             <scope>compile</scope>
         </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>com.microsoft.sqlserver</groupId>-->
         <!--            <artifactId>mssql-jdbc</artifactId>-->
@@ -128,6 +129,29 @@
         <!--        </dependency>-->
 
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hwmom-api-workflow</artifactId>
+            <version>2.2.2</version>
+            <scope>compile</scope>
+            <exclusions>
+                <!-- 排除消息总线依赖，QMS模块不需要,否则会一直引入本地的Kafka -->
+                <exclusion>
+                    <groupId>org.dromara</groupId>
+                    <artifactId>ruoyi-common-bus</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--通过 Dubbo 远程调用 workflow 服务的 completeTask 方法时。
+原因分析：该调用是在一个由 CompletableFuture.runAsync() 创建的异步线程中执行的。在 ruoyi-cloud-plus (以及类似的微服务架构) 中，用户认证信息（如 Sa-Token）通常是存储在 ThreadLocal 变量中的，它与当前请求线程绑定。当您创建一个新的子线程时，父线程的 ThreadLocal 变量默认不会传递给子线程。因此，在异步线程中，Sa-Token 的上下文丢失，导致 StpUtil.getTokenValue() 等方法无法获取到 token，当 Dubbo 客户端过滤器尝试将 token 放入 RPC 上下文时失败，或者说，在 workflow 服务端，Sa-Token 的服务端过滤器无法从 RPC 上下文中获取到 token，最终导致依赖用户身份认证的 FlwTaskServiceImpl.completeTask 方法抛出 "未能读取到有效 token" 的业务异常。
+解决方案：ruoyi-cloud-plus 框架集成了阿里巴巴的 TransmittableThreadLocal (TTL) 库来解决此问题。TTL可以实现父子线程之间的 ThreadLocal 数据传递。为了让 CompletableFuture 与 TTL 协同工作，需要将提交给它的 Runnable 或 Callable 任务用 TtlRunnable 或 TtlCallable 进行包装。这样，在任务执行前，TTL 会捕获父线程的上下文（包括 Sa-Token 的信息），并在子线程中恢复它。-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+            <version>2.14.4</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson2.JSONObject;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.pda.api.model.bo.GenerateInspectionTaskBo;
@@ -18,10 +20,14 @@ import org.dromara.qms.domain.vo.QcInspectionResultVo;
 import org.dromara.qms.domain.vo.QcUnqualifiedRecordVo;
 import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo;
 import org.dromara.qms.service.*;
+import org.dromara.resource.api.RemoteFileService;
+import org.dromara.resource.api.domain.RemoteFile;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -57,6 +63,66 @@ public class QcPDAController {
     //PDA业务Service
     private final IQcPDAService qcPDAService;
 
+    @DubboReference
+    private final RemoteFileService remoteFileService;
+
+
+    /**
+     * 处理文件上传的函数
+     *
+     * @param files 多部分文件列表
+     * @return 上传文件的URL列表
+     */
+    private List<Long>  handleFileUploads(List<MultipartFile> files) {
+        // 创建一个存储上传文件URL的列表
+        List<String> fileUrls = new ArrayList<>();
+        List<Long> ossIds = new ArrayList<>();
+        // 判断文件列表是否为空
+        if (files != null) {
+            // 遍历每个文件
+            for (MultipartFile file : files) {
+                // 获取原始文件名
+                String originalFilename = file.getOriginalFilename();
+                // 获取文件类型
+                String contentType = file.getContentType();
+                byte[] fileBytes;
+                try {
+                    // 获取文件字节内容
+                    fileBytes = file.getBytes();
+                } catch (IOException e) {
+                    // 记录错误日志并抛出服务异常
+                    log.error("获取文件字节失败: {}", originalFilename, e);
+                    throw new ServiceException("文件获取失败，请重试。");
+                }
+
+                try {
+                    // 调用远程文件服务的上传方法
+                    RemoteFile sysFile = remoteFileService.upload(originalFilename, originalFilename, contentType, fileBytes);
+                    // 判断上传结果是否成功
+                    if (sysFile != null && sysFile.getUrl() != null) {
+                        // 将文件URL添加到列表中
+                        fileUrls.add(sysFile.getUrl());
+                        ossIds.add(sysFile.getOssId());
+                    } else {
+                        // 记录警告日志
+                        log.warn("文件上传成功但未返回URL或返回数据为空: {}", originalFilename);
+                    }
+                } catch (ServiceException e) {
+                    // 记录服务异常日志并抛出新的服务异常
+                    log.error("文件上传服务异常: {}", originalFilename, e);
+                    throw new ServiceException("文件上传服务异常：" + e.getMessage());
+                } catch (Exception e) {
+                    // 记录未知错误日志并抛出新的服务异常
+                    log.error("文件上传过程中发生未知错误: {}", originalFilename, e);
+                    throw new ServiceException("文件上传过程中发生未知错误，请联系管理员。");
+                }
+            }
+        }
+        // 返回上传文件的URL列表
+        return ossIds;
+    }
+
+
     /**
      * 验证评审结果是否有效
      * 实现评审结果的五种处置方式验证：流转、报废、让步接收、返工、退货
@@ -96,7 +162,10 @@ public class QcPDAController {
     @PostMapping("/submitInspection")
     public R<Boolean> submitInspection(String json, List<MultipartFile> checkItemFiles) {
 
+        // 处理文件上传
+        List<Long> ossIds = handleFileUploads(checkItemFiles);
         QcInspectionMainBo bo= JSONObject.parseObject(json, QcInspectionMainBo.class);
+        bo.setOssIds(ossIds);
         Boolean result = qcPDAService.submitInspection(bo);
         if (result != null && result) {
             return R.ok(true);

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcUnqualifiedReviewController.java

@@ -1,26 +1,28 @@
 package org.dromara.qms.controller;
 
-import java.util.List;
-import java.util.ArrayList;
-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 jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 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.qms.domain.vo.QcUnqualifiedReviewVo;
-import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
-import org.dromara.qms.service.IQcUnqualifiedReviewService;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
+import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo;
+import org.dromara.qms.service.IQcUnqualifiedReviewService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 不合格品待评审
@@ -126,4 +128,15 @@ public class QcUnqualifiedReviewController extends BaseController {
         List<QcUnqualifiedReviewVo> list = qcUnqualifiedReviewService.queryList(bo);
         return R.ok(list);
     }
+
+    /**
+     * 主管审批
+     * @param bo
+     * @return
+     */
+    @PostMapping("/completeTask")
+    public R<Boolean> completeTask(@Validated(EditGroup.class) @RequestBody QcUnqualifiedReviewBo bo) {
+        return R.ok(qcUnqualifiedReviewService.completeTask(bo));
+    }
+
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedReview.java

@@ -1,14 +1,13 @@
 package org.dromara.qms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 不合格品待评审对象 qc_unqualified_review
@@ -146,4 +145,20 @@ public class QcUnqualifiedReview extends TenantEntity {
      */
     @TableField(exist = false)
     private String typeName;
+
+    /**
+     * 工作流实例ID
+     */
+    private Long processInstanceId;
+
+//    /**
+//     * 工作流状态（draft草稿、waiting待审核、finish完成、termination终止、back退回、cancel撤销）
+//     */
+//    private String processStatus;
+//
+//    /**
+//     * 当前任务ID
+//     */
+//    private Long currentTaskId;
+
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java

@@ -172,4 +172,9 @@ public class QcInspectionMainBo extends BaseEntity {
      */
     private List<QcInspectionResultBo> results;
 
+    /**
+     * 文件ID列表
+     */
+    List<Long> ossIds;
+
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedReviewBo.java

@@ -1,17 +1,13 @@
 package org.dromara.qms.domain.bo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.qms.domain.QcUnqualifiedReview;
-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 org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.qms.domain.QcUnqualifiedReview;
+
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 不合格品待评审业务对象 qc_unqualified_review
@@ -138,4 +134,24 @@ public class QcUnqualifiedReviewBo extends BaseEntity {
      * 检测类型名称
      */
     private String typeName;
+
+
+    /**
+     * 工作流实例ID
+     */
+    private Long processInstanceId;
+
+
+//    /**
+//     * 工作流状态（draft草稿、waiting待审核、finish完成、termination终止、back退回、cancel撤销）
+//     */
+//    private String processStatus;
+//
+//
+//    /**
+//     * 当前任务ID
+//     */
+//    private Long currentTaskId;
+
+
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedReviewVo.java

@@ -1,18 +1,16 @@
 package org.dromara.qms.domain.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.qms.domain.QcUnqualifiedReview;
 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 org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.qms.domain.QcUnqualifiedReview;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -169,4 +167,22 @@ public class QcUnqualifiedReviewVo implements Serializable {
      * 检测类型名称
      */
     private String typeName;
+
+
+
+    /**
+     * 工作流实例ID
+     */
+    private Long processInstanceId;
+
+//    /**
+//     * 工作流状态（draft草稿、waiting待审核、finish完成、termination终止、back退回、cancel撤销）
+//     */
+//    private String processStatus;
+//
+//    /**
+//     * 当前任务ID
+//     */
+//    private Long currentTaskId;
+
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedReviewService.java

@@ -66,4 +66,14 @@ public interface IQcUnqualifiedReviewService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+    /**
+     * 完成审批任务
+     *
+     * @param request 请求参数
+     * @return 是否完成成功
+     */
+    Boolean completeTask(QcUnqualifiedReviewBo bo);
+
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java

@@ -104,8 +104,9 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
 //        .eq(bo.getResult() != null, QcInspectionMain::getResult, bo.getResult())
             .eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionMain::getResult, bo.getResult())
             .eq(StringUtils.isNotBlank(bo.getWorkshop()), QcInspectionMain::getWorkshop, bo.getWorkshop())
-//        .eq(bo.getInspectionType() != null, QcInspectionMain::getInspectionType, bo.getInspectionType())
+        .eq(bo.getInspectionType() != null, QcInspectionMain::getInspectionType, bo.getInspectionType())
 //        .eq(bo.getStatus() != null, QcInspectionMain::getStatus, bo.getStatus())
+
             .eq(StringUtils.isNotBlank(bo.getQcInspectionType()), QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
             .eq(StringUtils.isNotBlank(bo.getStatus()), QcInspectionMain::getStatus, bo.getStatus())
             .eq(StringUtils.isNotBlank(bo.getInspector()), QcInspectionMain::getInspector, bo.getInspector())

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java

@@ -1,38 +1,33 @@
 package org.dromara.qms.service.impl;
 
+import com.alibaba.ttl.TtlRunnable;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.uuid.IdUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.pda.api.RemotePdaMesApiService;
 import org.dromara.pda.api.model.ProdQmsPlanDetail;
 import org.dromara.pda.api.model.bo.GenerateInspectionTaskBo;
-import org.dromara.qms.domain.bo.QcInspectionResultBo;
-import org.dromara.qms.domain.bo.QcInspectionTemplateBo;
-import org.dromara.qms.domain.bo.QcTemplateItemBo;
+import org.dromara.qms.domain.bo.*;
 import org.dromara.qms.domain.vo.*;
 import org.dromara.qms.service.*;
 import org.dromara.system.api.RemoteCodeRuleService;
+import org.dromara.workflow.api.RemoteWorkflowService;
+import org.dromara.workflow.api.domain.RemoteCompleteTask;
+import org.dromara.workflow.api.domain.RemoteStartProcess;
+import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.dromara.qms.domain.bo.QcInspectionMainBo;
-import org.dromara.common.core.domain.R;
 import org.springframework.transaction.annotation.Transactional;
-import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
-import org.dromara.qms.domain.bo.QcUnqualifiedRecordBo;
-import org.dromara.common.core.utils.MapstructUtils;
 
 import java.math.BigDecimal;
-import java.util.Date;
-
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * PDA接口Service业务层处理
@@ -40,11 +35,13 @@ import java.util.UUID;
  * @author YinQ
  * @date 2025-07-24
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 @DubboService
 public class QcPDAServiceImpl implements IQcPDAService {
 
+
     private final IQcInspectionMainService qcInspectionMainService;
 
     //质检结果子表
@@ -59,12 +56,19 @@ public class QcPDAServiceImpl implements IQcPDAService {
     //不合格记录子表
     private final IQcUnqualifiedRecordService qcUnqualifiedRecordService;
 
+    private final IQcInspectionMainFileRelationService qcInspectionMainFileRelationService;
+
     @DubboReference
     private final RemotePdaMesApiService remotePdaMesApiService;
 
     @DubboReference
     private final RemoteCodeRuleService remoteCodeRuleService;
 
+    //WARM-FLOW工作流
+    @DubboReference(timeout = 30000)
+    private final RemoteWorkflowService remoteWorkflowService;
+    private static final String UNQUALIFIED_REVIEW_FLOW_CODE = "unqualified_review";
+
 
     /**
      * 通过planDetailId和processId生成质检任务
@@ -145,6 +149,17 @@ public class QcPDAServiceImpl implements IQcPDAService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean submitInspection(QcInspectionMainBo bo) {
+
+        // 保存文件
+        List<Long> ossIds = bo.getOssIds();
+        for (Long ossId : ossIds){
+            QcInspectionMainFileRelationBo relation = new QcInspectionMainFileRelationBo();
+            relation.setInspectionId(bo.getInspectionId());
+            relation.setOssId(ossId);
+            qcInspectionMainFileRelationService.insertByBo(relation);
+        }
+
+
         // 根据传入的检验ID查询主记录信息
         Long inspectionId = bo.getInspectionId();
         Date nowDate = DateUtils.getNowDate();
@@ -303,6 +318,7 @@ public class QcPDAServiceImpl implements IQcPDAService {
      * @return
      */
     @Override
+    @GlobalTransactional(rollbackFor =  Exception.class)
     public Boolean handleUnqualified(String dispositionType, Long[] reviewIds) {
         for (Long reviewId : reviewIds) {
             QcUnqualifiedReviewVo reviewVo = qcUnqualifiedReviewService.queryById(reviewId);
@@ -312,13 +328,58 @@ public class QcPDAServiceImpl implements IQcPDAService {
             if (StringUtils.isNotEmpty(reviewVo.getReviewResult()) ) {
                 throw new ServiceException("此不合格评审单已评审");
             }
+
+            //集成工作流
+            RemoteStartProcess startProcess = new RemoteStartProcess();
+            startProcess.setBusinessId(String.valueOf(reviewId));
+            startProcess.setFlowCode(UNQUALIFIED_REVIEW_FLOW_CODE);
+            RemoteStartProcessReturn remoteStartProcessReturn = remoteWorkflowService.startWorkFlow(startProcess);
+            Long processInstanceId = remoteStartProcessReturn.getProcessInstanceId();
+            Long taskId = remoteStartProcessReturn.getTaskId();
+
+            // 更新数据
             QcUnqualifiedReviewBo reviewBo = new QcUnqualifiedReviewBo();
             reviewBo.setReviewId(reviewId);
             reviewBo.setReviewResult(dispositionType);
             reviewBo.setReviewer(LoginHelper.getUsername());
             reviewBo.setReviewStartTime(new Date());
+            reviewBo.setProcessInstanceId(processInstanceId);// 流程实例ID
             qcUnqualifiedReviewService.updateByBo(reviewBo);
-            //集成工作流
+
+            //异步推动流程
+            final Long finalTaskId = taskId;
+             CompletableFuture.runAsync(TtlRunnable.get(() -> {
+                 RemoteCompleteTask completeTask = new RemoteCompleteTask();
+                 completeTask.setTaskId(finalTaskId);
+                 completeTask.setMessage("启动不合格评审，处置类型: " + dispositionType);
+
+                 // 设置消息类型
+                 List<String> messageTypes = new ArrayList<>();
+                 messageTypes.add("1"); // 站内信
+                 completeTask.setMessageType(messageTypes);
+
+                 // 设置流程变量
+                 Map<String, Object> variables = new HashMap<>();
+                 variables.put("reviewResult", dispositionType);
+                 completeTask.setVariables(variables);
+
+                 remoteWorkflowService.completeTask(completeTask);
+             }));
+//                RemoteCompleteTask completeTask = new RemoteCompleteTask();
+//                completeTask.setTaskId(finalTaskId);
+//                completeTask.setMessage("启动不合格评审，处置类型: " + dispositionType);
+//
+//                // 设置消息类型
+//                List<String> messageTypes = new ArrayList<>();
+//                messageTypes.add("1"); // 站内信
+//                completeTask.setMessageType(messageTypes);
+//
+//                // 设置流程变量
+//                Map<String, Object> variables = new HashMap<>();
+//                variables.put("reviewResult", dispositionType);
+//                completeTask.setVariables(variables);
+//
+//                remoteWorkflowService.completeTask(completeTask);
         }
         return true;
     }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java

@@ -1,27 +1,31 @@
 package org.dromara.qms.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 io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.qms.domain.QcInspectionMain;
-import org.dromara.qms.domain.QcInspectionTemplate;
 import org.dromara.qms.domain.QcInspectionType;
-import org.springframework.stereotype.Service;
+import org.dromara.qms.domain.QcUnqualifiedReview;
 import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
 import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo;
-import org.dromara.qms.domain.QcUnqualifiedReview;
 import org.dromara.qms.mapper.QcUnqualifiedReviewMapper;
+import org.dromara.qms.service.IQcInspectionTypeService;
 import org.dromara.qms.service.IQcUnqualifiedReviewService;
+import org.dromara.workflow.api.RemoteWorkflowService;
+import org.dromara.workflow.api.domain.RemoteCompleteTask;
+import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 不合格品待评审Service业务层处理
@@ -35,6 +39,12 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
 
     private final QcUnqualifiedReviewMapper baseMapper;
 
+    private final IQcInspectionTypeService inspectionTypeService;
+
+    //WARM-FLOW工作流
+    @DubboReference(timeout = 30000)
+    private final RemoteWorkflowService remoteWorkflowService;
+
     /**
      * 查询不合格品待评审
      *
@@ -43,7 +53,11 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
      */
     @Override
     public QcUnqualifiedReviewVo queryById(Long reviewId) {
-        return baseMapper.selectVoById(reviewId);
+        QcUnqualifiedReviewVo qcUnqualifiedReviewVo = baseMapper.selectVoById(reviewId);
+        //获取检测类型
+        String typeName = inspectionTypeService.queryById(qcUnqualifiedReviewVo.getInspectionType()).getTypeName();
+        qcUnqualifiedReviewVo.setTypeName(typeName);
+        return qcUnqualifiedReviewVo;
     }
 
     /**
@@ -167,4 +181,36 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public Boolean completeTask(QcUnqualifiedReviewBo bo) {
+        QcUnqualifiedReview review = baseMapper.selectById(bo.getReviewId());
+        if (review == null) {
+            throw new ServiceException("不合格品待评审不存在");
+        }
+        if (ObjectUtils.isNotEmpty(review.getReviewEndTime())){
+            throw new ServiceException("该任务已处理完成");
+        }
+        Long currentTaskIdByInstanceId = remoteWorkflowService.getCurrentTaskIdByInstanceId(review.getProcessInstanceId());
+        if (currentTaskIdByInstanceId == null) {
+            throw new ServiceException("任务不存在");
+        }
+
+        review.setReviewer(LoginHelper.getUsername());
+        review.setReviewerId(LoginHelper.getUserId());
+        review.setReviewEndTime(new Date());
+
+        /*   工作流   */
+        RemoteCompleteTask completeTask = new RemoteCompleteTask();
+        completeTask.setTaskId(currentTaskIdByInstanceId);
+        // 设置消息类型
+        List<String> messageTypes = new ArrayList<>();
+        messageTypes.add("1"); // 站内信
+        completeTask.setMessageType(messageTypes);
+        completeTask.setMessage("审批通过 " );
+        remoteWorkflowService.completeTask(completeTask);
+
+        return baseMapper.updateById(review) > 0;
+    }
 }