From 66f0597bf6a1e79540c6bc51dedf561c22f3bdb5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 13 五月 2025 17:49:26 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3ListService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3ListService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3ListService.java
index 5fc33a3..8ec2288 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3ListService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3ListService.java
@@ -1,5 +1,6 @@
package com.example.server.progressTrack.service;
+import com.example.client.dto.ColumnDto;
import com.example.client.dto.JComboBoxItem;
import com.example.client.service.BaseService;
import com.example.server.progressTrack.Dto.DiagramMajorDto;
@@ -16,6 +17,7 @@
import org.springframework.stereotype.Service;
import javax.swing.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -54,7 +56,7 @@
public DjJdgzNetworkLevel3List getNextNode(Long nodeId, Long networkId) {
DjJdgzNetworkLevel3List djJdgzNetworkLevel3List =new DjJdgzNetworkLevel3List();
- List<DjJdgzNetworkLevel3List> list = baseDao.getNextNode(this.get(nodeId).getSort()+1,networkId);
+ List<DjJdgzNetworkLevel3List> list = baseDao.getNextNode(this.get(nodeId).getSort(),networkId);
if(list.size()>0){
djJdgzNetworkLevel3List = list.get(0);
}else{
@@ -63,8 +65,16 @@
return djJdgzNetworkLevel3List;
}
- public List<DjJdgzNetworkLevel3List> getDefult() {
- return baseDao.getDefult();
+ public List<DjJdgzNetworkLevel3List> getDefult(String type) {
+ Long defultId = null;
+ if (type.equals("鏀硅繘鎬т慨鐞�")||type.equals("鏀规崲瑁�")){
+ defultId = 10002L;
+ } else if (type.equals("涓嶅瑁呰澶�")) {
+ defultId = 10001L;
+ }else if (type.equals("淇悊")) {
+ defultId = 10000L;
+ }
+ return baseDao.getDefult(defultId);
}
public void save(List<DjJdgzNetworkLevel3List> list, Long networkId, JPanel jPanel, mxGraph graph) {
//baseDao.deleteAll(networkId);
@@ -83,7 +93,7 @@
data.setContent(simpleDiagram);
djJdgzNetworkLevel3Service.update(data);
- netWorkDiagramService.getCsDiagram(graph,simpleDiagram,null,jPanel.getWidth(),jPanel.getHeight());
+ netWorkDiagramService.getCsDiagram(graph,simpleDiagram,null,jPanel.getWidth(),jPanel.getHeight(),null);
}
public JComboBoxItem[] getListBothItem(Long networkId) {
--
Gitblit v1.9.1