ソースを参照

新增根据流程ID获取模板意见方法

chenjun 1 年間 前
コミット
9aa2ddf0ee

+ 1 - 1
zjugis-workflow/src/main/java/com/zjugis/z_workflow/controller/IFlowOpinionController.java

@@ -190,7 +190,7 @@ public class IFlowOpinionController extends BaseController {
 
 
     /**
-     * 获取历史意见列表
+     * 获取根据流程获取意见
      **/
     @ResponseBody
     @RequestMapping

+ 19 - 8
zjugis-workflow/src/main/java/com/zjugis/z_workflow/controller/TFlowOpinionController.java

@@ -2,15 +2,15 @@ package com.zjugis.z_workflow.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.model.Grid;
 import com.zjugis.framework.workflow.spring.resovler.ParamModel;
+import com.zjugis.z_workflow.entity.IFlowInstance;
+import com.zjugis.z_workflow.entity.IFlowOpinion;
 import com.zjugis.z_workflow.entity.TFlowOpPersonal;
 import com.zjugis.z_workflow.entity.TFlowOpinion;
-import com.zjugis.z_workflow.service.ActivityRelOpinionService;
-import com.zjugis.z_workflow.service.TActivityTemplateService;
-import com.zjugis.z_workflow.service.TFlowOpPersonalService;
-import com.zjugis.z_workflow.service.TFlowOpinionService;
+import com.zjugis.z_workflow.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -18,10 +18,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 审批意见模板管理控制器
@@ -39,6 +36,8 @@ public class TFlowOpinionController extends BaseController {
     private ActivityRelOpinionService activityRelOpinionService;
     @Autowired
     private TActivityTemplateService tActivityTemplateService;
+    @Autowired
+    private IFlowInstanceService iFlowInstanceService;
     //endregion
 
     //region 界面
@@ -278,6 +277,18 @@ public class TFlowOpinionController extends BaseController {
         }
     }
 
+    /**
+     * 获取根据流程ID获取模板意见
+     **/
+    @ResponseBody
+    @RequestMapping
+    public CommonResult<List<TFlowOpinion>> getOpinionListByFlowInstanceId(String flowInstanceId) {
+        IFlowInstance flowInstance = iFlowInstanceService.findInstance(flowInstanceId);
+        List<TFlowOpinion> resultList = TFlowOpinionService.getByFlowTempVersionId(flowInstance.getFlowTemplateVersionId());
+        Collections.reverse(resultList);
+        return CommonResult.success(resultList);
+    }
+
     /**
      * 更新意见是否启用状态
      * @param activityTempId 活动模板ID