Commit d4ec3a1b authored by chenzhao's avatar chenzhao

修改接口 适配树组件

parent b34bfda6
...@@ -18,6 +18,8 @@ import java.util.List; ...@@ -18,6 +18,8 @@ import java.util.List;
public class EmergencyRelationTree extends BasicEntity { public class EmergencyRelationTree extends BasicEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String sequenceNbr;
//职责id //职责id
private Long obligationId; private Long obligationId;
......
...@@ -57,6 +57,7 @@ public class EmergencyTaskController extends BaseController{ ...@@ -57,6 +57,7 @@ public class EmergencyTaskController extends BaseController{
tree.setId(e.getId()); tree.setId(e.getId());
tree.setName(e.getDictName()); tree.setName(e.getDictName());
tree.setType("0"); tree.setType("0");
tree.setSequenceNbr(String.valueOf(e.getId()));
tree.setCode(e.getDictValue()); tree.setCode(e.getDictValue());
tree.setChildren(treeNodes.stream().filter(t->t.getObligationId().equals(e.getId())).collect(Collectors.toList())); tree.setChildren(treeNodes.stream().filter(t->t.getObligationId().equals(e.getId())).collect(Collectors.toList()));
list.add(tree); list.add(tree);
...@@ -65,6 +66,7 @@ public class EmergencyTaskController extends BaseController{ ...@@ -65,6 +66,7 @@ public class EmergencyTaskController extends BaseController{
//增加根节点 //增加根节点
EmergencyRelationTree tree = new EmergencyRelationTree(); EmergencyRelationTree tree = new EmergencyRelationTree();
tree.setId(0); tree.setId(0);
tree.setSequenceNbr("0");
tree.setName("全部"); tree.setName("全部");
tree.setType("3"); tree.setType("3");
tree.setCode("0"); tree.setCode("0");
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
SELECT SELECT
cer.person_id as id, cer.person_id as id,
cer.person_id as sequenceNbr,
cer.person_name as name, cer.person_name as name,
cer.obligationId as obligationId, cer.obligationId as obligationId,
'1' as type '1' as type
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment