活动流程意见返回添加用户ID

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

@@ -8,9 +8,11 @@ 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.IActivityInsParticiPant;
 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.IActivityInsParticiPantService;
 import com.zjugis.z_workflow.service.IActivityInstanceService;
 import com.zjugis.z_workflow.service.IFlowInstanceService;
 import com.zjugis.z_workflow.service.IFlowOpinionService;
@@ -51,6 +53,9 @@ public class IFlowOpinionController extends BaseController {
     @Lazy
     @Autowired
     private IActivityInstanceService IActivityInstanceService;
+    @Lazy
+    @Autowired
+    private IActivityInsParticiPantService IActivityInsParticiPantService;
 
 	@Value("${serviceUrl.z_workflow}")
 	String workflowUrl;
@@ -206,12 +211,17 @@ public class IFlowOpinionController extends BaseController {
     public CommonResult<List<IFlowOpinion>> getOpinionListByFlowInstanceId(String flowInstanceId) {
         List<IFlowOpinion> flowOpinions = IFlowOpinionService.getFlowOpinions(flowInstanceId);
         List<IActivityInstance> activityhandleRecord = IActivityInstanceService.getActivityhandleRecord(flowInstanceId);
+        List<IActivityInsParticiPant> particiPantList = IActivityInsParticiPantService.findByFlowInstanceId(flowInstanceId);
         Map<String, IActivityInstance> stringIActivityInstanceMap = convertMap(activityhandleRecord, IActivityInstance::getId);
+        Map<String, IActivityInsParticiPant> stringIActivityInsParticiPantMap = convertMap(particiPantList, IActivityInsParticiPant::getId);
         flowOpinions.forEach(iFlowOpinion -> {
             // 设置状态
             MapUtils.findAndThen(stringIActivityInstanceMap, iFlowOpinion.getActivityInstanceId(), iActivityInstance -> {
                 iFlowOpinion.setStatus(iActivityInstance.getStatus());
-                iFlowOpinion.setUserId(iActivityInstance.getUserId());
+            });
+            // 设置用户
+            MapUtils.findAndThen(stringIActivityInsParticiPantMap, iFlowOpinion.getParticipantId(), iActivityInsParticiPant -> {
+                iFlowOpinion.setUserId(iActivityInsParticiPant.getUserId());
             });
         });
         return CommonResult.success(flowOpinions);