修改

jinlin

2025-04-10 af67fb927c3f30fa70df834f0e97f0b4a91e6119

 src/main/java/com/example/client/service/ImportTrackRecordService.java

@@ -7,7 +7,10 @@
import com.example.server.progressTrack.model.DjJdgzTrackRecord;
import com.example.server.progressTrack.service.*;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -179,6 +182,9 @@
                for (JComboBoxItem item : selectedItems) {
                    selectedIds.append(item.getId()).append(",");
                }
                if (StringUtils.isNotBlank(selectedIds)){
                    selectedIds.deleteCharAt(selectedIds.length()-1);
                }
                List<DjJdgzTrackRecord> list  = djJdgzTrackRecordService.getListByImport(level1Id,level2Id,level2NodeId,selectedIds.toString());
                DownLoadTmpFile.buildTrack(list,tmpPath + "跟踪记录导入模板.xlsx", frame);
            }
@@ -263,10 +269,16 @@
                        return;
                    }

                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                        return;
                    }

                    model.setDataVector(data, columnIdentifiers);
                    table.setModel(model);
                    table.getColumnModel().getColumn(0).setPreferredWidth(600);
                    table.getColumnModel().getColumn(1).setPreferredWidth(100);
                    table.getColumnModel().getColumn(0).setPreferredWidth(550);
                    table.getColumnModel().getColumn(1).setPreferredWidth(150);


                    table.getColumnModel().getColumn(0).setCellRenderer(new TableViewRenderer());
@@ -319,9 +331,9 @@
                                JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
                                JComboBoxItem[] cabinList = cabinService.getList();
                                String[] typeList = new String[]{
                "","改装", "加装", "换装", "改进性修理"
                "","改装", "加装", "换装", "修理","改进性修理"
        };
                                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0, null);
                                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0,0, null);
                                CommonTable.refreshTable(list, columnDto, subTable);
                                trackRecordManageService.tableModelListener(subTable, jFrame, list);
                                System.out.println("导入成功时间" + new Date());
@@ -375,10 +387,18 @@
                        JOptionPane.showMessageDialog(null, "只能上传.xlsx或.xls的文件，且不超过2G\"", "提示", JOptionPane.WARNING_MESSAGE);
                        return flag;
                    }

                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        flag = false;
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                        return flag;
                    }

                    model.setDataVector(data, columnIdentifiers);
                    table.setModel(model);
                    table.getColumnModel().getColumn(0).setPreferredWidth(650);
                    table.getColumnModel().getColumn(1).setPreferredWidth(80);
                    table.getColumnModel().getColumn(0).setPreferredWidth(550);
                    table.getColumnModel().getColumn(1).setPreferredWidth(150);

                    table.getColumnModel().getColumn(0).setCellRenderer(new TableViewRenderer());
                    table.getColumnModel().getColumn(1).setCellRenderer(new TableCellRendererButton());