From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/StatisProductService.java | 84 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/example/client/service/StatisProductService.java b/src/main/java/com/example/client/service/StatisProductService.java
index 51bd380..1402c22 100644
--- a/src/main/java/com/example/client/service/StatisProductService.java
+++ b/src/main/java/com/example/client/service/StatisProductService.java
@@ -18,7 +18,8 @@
public class StatisProductService {
@Autowired
DjJdgzNetworkLevel3Service djJdgzNetworkLevel3Service;
- public void createTable(JFrame jFrame, Long level1Id) {
+
+ public void createTable(JFrame jFrame, Long level1Id, String type) {
JFrame frame1 = new JFrame("璁惧杩涘害缁熻鎬昏〃");
frame1.setSize(1500, 800);
frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -32,29 +33,72 @@
}
});
- List<StatistProductDto> list = djJdgzNetworkLevel3Service.getStatist(level1Id);
+ List<StatistProductDto> list = djJdgzNetworkLevel3Service.getStatist(level1Id, type);
+ if (type.equals("鏀硅繘鎬т慨鐞�") || type.equals("鏀规崲瑁�")) {
+ Object[][] headerRows = new Object[2][4];
+ headerRows[0] = new Object[]{"閮ㄩ棬/涓撲笟", "鍚勮妭鐐圭殑璁惧涓暟", ComplexTable.mergeCellX, "鑺傜偣鍏ㄩ儴瀹屾垚涓暟"};
+ //姝ゅ2-5鏄笉浼氭樉绀哄嚭鏉ョ殑锛屽洜涓�1-4鍚戜笅鍚堝苟浜嗕竴琛� + 鍚戝彸鍚堝苟浜嗕竴鍒� 锛� 鑰�2-5琚繖涓煩褰㈣寖鍥村寘鎷簡
+ headerRows[1] = new Object[]{ComplexTable.mergeCellY, "璁惧鍒板巶", "璁惧瀹夎", ComplexTable.mergeCellY};
- Object[][] headerRows = new Object[2][9];
- headerRows[0] = new Object[]{"閮ㄩ棬/涓撲笟","鍚勮妭鐐圭殑璁惧涓暟", ComplexTable.mergeCellX,ComplexTable.mergeCellX,ComplexTable.mergeCellX,ComplexTable.mergeCellX,"鑺傜偣鍏ㄩ儴瀹屾垚涓暟"};
- //姝ゅ2-5鏄笉浼氭樉绀哄嚭鏉ョ殑锛屽洜涓�1-4鍚戜笅鍚堝苟浜嗕竴琛� + 鍚戝彸鍚堝苟浜嗕竴鍒� 锛� 鑰�2-5琚繖涓煩褰㈣寖鍥村寘鎷簡
- headerRows[1] = new Object[]{ComplexTable.mergeCellY, "璁惧鎷嗗嵏鍑鸿埍","璁惧鍒嗕氦","鎷嗘閴村畾","璁惧杩斿巶","鍥炶",ComplexTable.mergeCellY};
+ String[][] body = new String[list.size()][4];
- String[][] body = new String[list.size()][9];
+ for (int i = 0; i < list.size(); i++) {
+ StatistProductDto data = list.get(i);
+ body[i][0] = data.getName();
+ body[i][1] = String.valueOf(data.getDcsl());
+ body[i][2] = String.valueOf(data.getAzsl());
+ body[i][3] = String.valueOf(data.getWcsl());
+ }
- for (int i = 0; i < list.size(); i++) {
- StatistProductDto data =list.get(i);
- body[i][0] = data.getName();
- body[i][1] = String.valueOf(data.getCxsl());
- body[i][2] = String.valueOf(data.getFjsl());
- body[i][3] = String.valueOf(data.getJdsl());
- body[i][4] = String.valueOf(data.getFcsl());
- body[i][5] = String.valueOf(data.getHzsl());
- body[i][6] = String.valueOf(data.getWcsl());
+ JScrollPane scrollTable = new JScrollPane(new ComplexTable(headerRows, body, 367));
+ frame1.add(scrollTable);
+ frame1.setVisible(true);
+
+ } else if (type.equals("涓嶅瑁呰澶�")) {
+ Object[][] headerRows = new Object[2][6];
+ headerRows[0] = new Object[]{"閮ㄩ棬/涓撲笟", "鍚勮妭鐐圭殑璁惧涓暟", ComplexTable.mergeCellX, ComplexTable.mergeCellX, ComplexTable.mergeCellX, "鑺傜偣鍏ㄩ儴瀹屾垚涓暟"};
+ //姝ゅ2-5鏄笉浼氭樉绀哄嚭鏉ョ殑锛屽洜涓�1-4鍚戜笅鍚堝苟浜嗕竴琛� + 鍚戝彸鍚堝苟浜嗕竴鍒� 锛� 鑰�2-5琚繖涓煩褰㈣寖鍥村寘鎷簡
+ headerRows[1] = new Object[]{ComplexTable.mergeCellY, "鎷嗗嵏鍑鸿埍", "鍏ュ簱", "瀛樻斁浣嶇疆","绉讳氦T闃�", ComplexTable.mergeCellY};
+
+ String[][] body = new String[list.size()][6];
+
+ for (int i = 0; i < list.size(); i++) {
+ StatistProductDto data = list.get(i);
+ body[i][0] = data.getName();
+ body[i][1] = String.valueOf(data.getCcsl());
+ body[i][2] = String.valueOf(data.getRksl());
+ body[i][3] = String.valueOf(data.getCfsl());
+ body[i][4] = String.valueOf(data.getYjsl());
+ body[i][5] = String.valueOf(data.getWcsl());
+ }
+
+ JScrollPane scrollTable = new JScrollPane(new ComplexTable(headerRows, body, 245));
+ frame1.add(scrollTable);
+ frame1.setVisible(true);
+
+ } else if (type.equals("淇悊")) {
+ Object[][] headerRows = new Object[2][7];
+ headerRows[0] = new Object[]{"閮ㄩ棬/涓撲笟", "鍚勮妭鐐圭殑璁惧涓暟", ComplexTable.mergeCellX, ComplexTable.mergeCellX, ComplexTable.mergeCellX, ComplexTable.mergeCellX, "鑺傜偣鍏ㄩ儴瀹屾垚涓暟"};
+ //姝ゅ2-5鏄笉浼氭樉绀哄嚭鏉ョ殑锛屽洜涓�1-4鍚戜笅鍚堝苟浜嗕竴琛� + 鍚戝彸鍚堝苟浜嗕竴鍒� 锛� 鑰�2-5琚繖涓煩褰㈣寖鍥村寘鎷簡
+ headerRows[1] = new Object[]{ComplexTable.mergeCellY, "璁惧鎷嗗嵏鍑鸿埍", "璁惧鍒嗕氦", "鎷嗘閴村畾", "璁惧杩斿巶", "鍥炶", ComplexTable.mergeCellY};
+
+ String[][] body = new String[list.size()][7];
+
+ for (int i = 0; i < list.size(); i++) {
+ StatistProductDto data = list.get(i);
+ body[i][0] = data.getName();
+ body[i][1] = String.valueOf(data.getCxsl());
+ body[i][2] = String.valueOf(data.getFjsl());
+ body[i][3] = String.valueOf(data.getJdsl());
+ body[i][4] = String.valueOf(data.getFcsl());
+ body[i][5] = String.valueOf(data.getHzsl());
+ body[i][6] = String.valueOf(data.getWcsl());
+ }
+
+ JScrollPane scrollTable = new JScrollPane(new ComplexTable(headerRows, body, 210));
+ frame1.add(scrollTable);
+ frame1.setVisible(true);
}
-
- JScrollPane scrollTable = new JScrollPane(new ComplexTable(headerRows , body,210));
- frame1.add(scrollTable);
- frame1.setVisible(true);
}
}
--
Gitblit v1.9.1