更新至(2e305f)

zss

2024-12-23 5172db1a5ceda6bfbeaad6fef8f77b184cffa914

 cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java

@@ -30,6 +30,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -99,10 +100,14 @@
        String endDate = processMethodSearchNew.getEndDate();
        String writeUserId = processMethodSearchNew.getWriteUserId().toString();
        String ratifyUserId = processMethodSearchNew.getRatifyUserId().toString();
        String writeDate = processMethodSearchNew.getWriteDate();
        String ratifyDate = processMethodSearchNew.getRatifyDate();
        processMethodSearchNew.setBeginDate(null);
        processMethodSearchNew.setEndDate(null);
        processMethodSearchNew.setWriteUserId(null);
        processMethodSearchNew.setRatifyUserId(null);
        processMethodSearchNew.setWriteDate(null);
        processMethodSearchNew.setRatifyDate(null);
        List<ProcessMethodSearchNewDto> methodSearchNews = baseMapper.selectMethodSearchNew(QueryWrappers.queryWrappers(processMethodSearchNew), beginDate, endDate);

        int index = 1;
@@ -118,9 +123,9 @@
            // 备注
            if (methodSearchNew.getRemark() != null) {
                if (methodSearchNew.getRemark().equals(1)) {
                    methodSearchNew.setIsNewStandardString("替换");
                    methodSearchNew.setRemarkString("替换");
                } else {
                    methodSearchNew.setIsNewStandardString("作废");
                    methodSearchNew.setRemarkString("作废");
                }
            }

@@ -182,14 +187,15 @@
            List<List<Object>> totalListList = ListUtils.newArrayList();
            List<Object> totalList = ListUtils.newArrayList();
            totalListList.add(totalList);
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
            // 第一列
            totalList.add("查新人：");
            totalList.add("编制人：");
            // 第二列 设置签名
            totalList.add(FileUtils.readFileToByteArray(new File(writeUserUrl)));
            // 第三列
            totalList.add("日期：");
            // 第五列
            totalList.add("2024-12-23"); // 日期写死
            totalList.add(writeDate);
            // 第六列
            totalList.add("审核：");
            // 第七列
@@ -197,7 +203,7 @@
            // 第八列
            totalList.add("日期：");
            // 第九列
            totalList.add("2024-12-23"); // 日期写死
            totalList.add(ratifyDate);
            // 这里是write 别和fill 搞错了
            excelWriter.write(totalListList, writeSheet);