lxp
2025-03-18 059b188fd49c5127b75a38408d12e26d2363fbab
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
@@ -28,10 +28,7 @@
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -77,9 +74,11 @@
        List<ProcessReport> processReports = processReportMapper.getIds(ids);
        for (ProcessReport processReport : processReports) {
            List<String> name = new ArrayList<>();
            for (String s : processReport.getSignatory().split(",")) {
                User user = userMapper.selectById(Integer.parseInt(s));
                name.add(user.getName());
            if(StringUtils.isNotEmpty(processReport.getSignatory())) {
                for (String s : processReport.getSignatory().split(",")) {
                    User user = userMapper.selectById(Integer.parseInt(s));
                    name.add(user.getName());
                }
            }
            String signatoryName = name.stream().collect(Collectors.joining(","));
            processReport.setSignatoryName(signatoryName);
@@ -293,7 +292,11 @@
                            }
                            else if (j == 6) {
                                try{
                                    textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getSendTime()+"");
                                    String text = "";
                                    if(Objects.nonNull(processReports.get((i-1) + (index1 - 1) * 20).getSendTime())) {
                                        text = processReports.get((i-1) + (index1 - 1) * 20).getSendTime() + "";
                                    }
                                    textRenderData.setText(text);
                                } catch (Exception e) {
                                    textRenderData.setText("");
                                }