From a857feef16fdd2ea9295f0be82a8fdaa34f13595 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 24 四月 2025 18:10:30 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
index f78ed46..71a6b97 100644
--- a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
@@ -11,7 +11,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.sysOss.model.SysOss;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -106,7 +106,7 @@
trackPersonDesc.setText(data.getTrackPerson());
}
- JLabel JLabel34 = new JLabel("鍗曚綅");
+ JLabel JLabel34 = new JLabel("T鏂瑰崟浣�");
JTextField trackPersonUnitDesc = new JTextField(16);
if (StringUtils.isNotBlank(data.getTrackPersonUnit())) {
trackPersonUnitDesc.setText(data.getTrackPersonUnit());
@@ -124,7 +124,7 @@
trackedPersonDesc.setText(data.getTrackedPerson());
}
- JLabel JLabel56 = new JLabel("鍗曚綅");
+ JLabel JLabel56 = new JLabel("鍘傛柟鍗曚綅");
JTextField trackedPersonUnitDesc = new JTextField(16);
if (StringUtils.isNotBlank(data.getTrackedPersonUnit())) {
trackedPersonUnitDesc.setText(data.getTrackedPersonUnit());
@@ -176,7 +176,7 @@
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(statusList);
comboBox1.setPreferredSize(new Dimension(185, 28));
if (data.getCurrentStatus() != null) {
- comboBox0.setSelectedItem(new JComboBoxItem(data.getCurrentStatus().longValue(), statusMap.get(data.getCurrentStatus())));
+ comboBox1.setSelectedItem(statusList[data.getCurrentStatus()]);
}
@@ -184,7 +184,7 @@
JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(hasDelayRiskList);
comboBox2.setPreferredSize(new Dimension(185, 28));
if (data.getHasDelayRisk() != null) {
- comboBox0.setSelectedItem(new JComboBoxItem(data.getHasDelayRisk().longValue(), hasDelayRiskMap.get(data.getHasDelayRisk())));
+ comboBox2.setSelectedItem(hasDelayRiskList[data.getHasDelayRisk()]);
}
@@ -298,7 +298,11 @@
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user", "user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
+ if (user == null) {
+ JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛宸插け鏁堣閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
DjJdgzNetworkLevel3 level3 = djJdgzNetworkLevel3Service.get(data.getLevel3NetworkId());
if (user.getTeamgroup() != null && !user.getTeamgroup().equals(level3.getTeamgroupId().toString())) {
JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
@@ -337,13 +341,15 @@
data.setProblem(problem.getText());
data.setFollowupPlan(plan.getText());
data.setRemark(remark.getText());
- Long id = djJdgzTrackRecordService.save(data);
+ Long id = djJdgzTrackRecordService.save(data,"save");
uploadFile.save(id);
- List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0, null);
+ List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0,0, null);
CommonTable.refreshTable(list, columnDto, table);
trackRecordManageService.tableModelListener(table, jFrame, list);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+
}
});
--
Gitblit v1.9.1