Merge remote-tracking branch 'origin/master'

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

@@ -3,12 +3,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.common.util.collection.MapUtils;
 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.framework.workflow.utils.Constant;
+import com.zjugis.z_workflow.entity.IActivityInstance;
 import com.zjugis.z_workflow.entity.IFlowInstance;
 import com.zjugis.z_workflow.entity.IFlowOpinion;
+import com.zjugis.z_workflow.service.IActivityInstanceService;
 import com.zjugis.z_workflow.service.IFlowInstanceService;
 import com.zjugis.z_workflow.service.IFlowOpinionService;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +30,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.zjugis.framework.common.util.collection.CollectionUtils.convertMap;
+import static com.zjugis.framework.common.util.collection.CollectionUtils.convertSet;
+
 /**
  * 审批意见处理控制器
  */
@@ -42,6 +48,9 @@ public class IFlowOpinionController extends BaseController {
 	@Lazy
 	@Autowired
 	private IFlowInstanceService IFlowInstanceService;
+    @Lazy
+    @Autowired
+    private IActivityInstanceService IActivityInstanceService;
 
 	@Value("${serviceUrl.z_workflow}")
 	String workflowUrl;
@@ -195,7 +204,16 @@ public class IFlowOpinionController extends BaseController {
     @ResponseBody
     @RequestMapping
     public CommonResult<List<IFlowOpinion>> getOpinionListByFlowInstanceId(String flowInstanceId) {
-        return CommonResult.success(IFlowOpinionService.getFlowOpinions(flowInstanceId));
+        List<IFlowOpinion> flowOpinions = IFlowOpinionService.getFlowOpinions(flowInstanceId);
+        List<IActivityInstance> activityhandleRecord = IActivityInstanceService.getActivityhandleRecord(flowInstanceId);
+        Map<String, IActivityInstance> stringIActivityInstanceMap = convertMap(activityhandleRecord, IActivityInstance::getId);
+        flowOpinions.forEach(iFlowOpinion -> {
+            // 设置状态
+            MapUtils.findAndThen(stringIActivityInstanceMap, iFlowOpinion.getActivityInstanceId(), iActivityInstance -> {
+                iFlowOpinion.setStatus(iActivityInstance.getStatus());
+            });
+        });
+        return CommonResult.success(flowOpinions);
     }
 
 	/**

zjugis-workflow/src/main/java/com/zjugis/z_workflow/entityExtend/IFlowOpinionVo.java

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 public class IFlowOpinionVo {
 
     /**
-     * 1-正常 10-申请挂起 20-已挂起 90-已完成
+     * 1-正常 10-申请挂起 20-已挂起 90-已完成 40-退件
      */
     @TableField(exist = false)
     private Integer status;