From 4a29c1e7cd13cbe66614a124ed3d673ad5d5ccbd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 11:17:24 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/form/WorkflowForm.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/WorkflowForm.java b/src/main/java/kr/wisestone/owl/web/form/WorkflowForm.java
index f42ace5..69f3a1a 100644
--- a/src/main/java/kr/wisestone/owl/web/form/WorkflowForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/WorkflowForm.java
@@ -3,9 +3,9 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
-import kr.wisestone.owl.vo.IssueStatusVo;
-import kr.wisestone.owl.vo.WorkflowTransitionVo;
+import kr.wisestone.owl.vo.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -19,6 +19,7 @@
private String description;
private List<IssueStatusVo> issueStatusVos = Lists.newArrayList();
private List<Long> removeIds = Lists.newArrayList();
+ private List<WorkflowDepartmentVo> workflowDepartmentVos = Lists.newArrayList();
public WorkflowForm(){}
@@ -39,6 +40,8 @@
for (Map<String, Object> issueStatusVo : tempIssueStatusVos) {
IssueStatusVo addIssueStatusVo = ConvertUtil.convertMapToClass(issueStatusVo, IssueStatusVo.class);
+
+
// issueStatus x, y 醫뚰몴 媛� 蹂�寃� �젙蹂� �뀑�똿
for (Map<String, Object> node : nodes) {
Long nodeId = MapUtil.getLong(node, "id");
@@ -77,6 +80,20 @@
}
}
}
+
+ // �떞�떦 遺��꽌 �뀑�똿
+ List<Map<String, Object>> workflowDepartments = (List)issueStatusVo.get("workflowDepartmentVos");
+ List<WorkflowDepartmentVo> departmentVos = Lists.newArrayList();
+ for (Map<String, Object> workflowDepartment : workflowDepartments) {
+ Map<String, Object> department = (Map<String, Object>)workflowDepartment.get("departmentVo");
+ DepartmentVo departmentVo = ConvertUtil.convertMapToClass(department, DepartmentVo.class);
+ WorkflowDepartmentVo workflowDepartmentVo = new WorkflowDepartmentVo();
+ workflowDepartmentVo.setDepartmentVo(departmentVo);
+ workflowDepartmentVo.setIssueStatusVo(addIssueStatusVo);
+
+ departmentVos.add(workflowDepartmentVo);
+ }
+ addIssueStatusVo.setWorkflowDepartmentVos(departmentVos);
addIssueStatusVo.setWorkflowTransitionVos(ConvertUtil.convertListToListClass(workflowTransitionVos, WorkflowTransitionVo.class));
@@ -141,4 +158,12 @@
public void addRemoveIds(Long removeId) {
this.removeIds.add(removeId);
}
+
+ public List<WorkflowDepartmentVo> getWorkflowDepartmentVos() {
+ return workflowDepartmentVos;
+ }
+
+ public void setWorkflowDepartmentVos(List<WorkflowDepartmentVo> workflowDepartmentVos) {
+ this.workflowDepartmentVos = workflowDepartmentVos;
+ }
}
--
Gitblit v1.8.0