From ebede85283906f52dd45d0755d22140538038ac3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 十二月 2024 13:27:47 +0800
Subject: [PATCH] 完成6.6供应商模块
---
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java
index 7c9ca22..2e691cd 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java
+++ b/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);
// 杩欓噷鏄痺rite 鍒拰fill 鎼為敊浜�
excelWriter.write(totalListList, writeSheet);
--
Gitblit v1.9.3