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/client/service/TrackRecordAddOrUpdate.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java index 71a6b97..9624b4d 100644 --- a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java +++ b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java @@ -7,6 +7,7 @@ import com.example.client.utils.UploadFile; import com.example.server.progressTrack.model.DjJdgzDismantTrack; import com.example.server.progressTrack.model.DjJdgzNetworkLevel3; +import com.example.server.progressTrack.model.DjJdgzNetworkLevel3List; import com.example.server.progressTrack.model.DjJdgzTrackRecord; import com.example.server.progressTrack.service.*; import com.example.server.sysOss.model.SysOss; @@ -37,8 +38,15 @@ private UploadFile uploadFile; @Autowired private DjJdgzDismantTrackService djJdgzDismantTrackService; + @Autowired + private DjJdgzNetworkLevel3ListService djJdgzNetworkLevel3ListService; public void openDialog(DjJdgzTrackRecord data, JFrame jFrame, Long level1Id, List<ColumnDto> columnDto, JTable table) { + if (StringUtils.isBlank(data.getLevel3NodeName())) { + DjJdgzNetworkLevel3List djJdgzNetworkLevel3List = djJdgzNetworkLevel3ListService.get(data.getLevel3NodeId()); + data.setLevel3NodeName(djJdgzNetworkLevel3List.getProcessName()); + data.setProcessName(djJdgzNetworkLevel3List.getProcessName()); + } JFrame frame1 = new JFrame(data.getLevel3NetworkName() + "璺熻釜璁板綍"); frame1.setSize(1200, 800); frame1.setResizable(false); @@ -156,8 +164,8 @@ JLabel JLabel10 = new JLabel("鍒嗘壙淇崟浣�"); JTextField repairUnitDesc = new JTextField(16); - if (StringUtils.isNotBlank(data.getRepairUnitContact())) { - repairUnitDesc.setText(data.getRepairUnitContact()); + if (StringUtils.isNotBlank(data.getRepairUnit())) { + repairUnitDesc.setText(data.getRepairUnit()); } JLabel JLabel11 = new JLabel("璐熻矗浜�"); @@ -341,9 +349,9 @@ data.setProblem(problem.getText()); data.setFollowupPlan(plan.getText()); data.setRemark(remark.getText()); - Long id = djJdgzTrackRecordService.save(data,"save"); + Long id = djJdgzTrackRecordService.save(data, "save"); uploadFile.save(id); - List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0,0, null); + List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), level3.getTeamgroupId(), null, null, 0, null, null); CommonTable.refreshTable(list, columnDto, table); trackRecordManageService.tableModelListener(table, jFrame, list); frame1.dispose(); -- Gitblit v1.9.1