From 0e96251ba40dec171d92f99a2ec482f692bdf1ab Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:30:52 +0800
Subject: [PATCH] 完成截止12.26测试出来的问题
---
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodVerifyServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodVerifyServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodVerifyServiceImpl.java
index d7ace3d..fb7959b 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodVerifyServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodVerifyServiceImpl.java
@@ -303,6 +303,9 @@
// 灏嗕汉鍛樼鍚嶅璞℃坊鍔犲埌闆嗗悎涓�
pictureRenderDataList.add(finalUserSignatureUrl);
}
+ while (pictureRenderDataList.size() < 5) {
+ pictureRenderDataList.add(null);
+ }
// 鑾峰彇璁惧淇℃伅
List<ProcessMethodVerifyMachineAttachment> processMethodVerifyMachineAttachmentList = processMethodVerifyMachineAttachmentService.list(Wrappers.<ProcessMethodVerifyMachineAttachment>lambdaQuery()
@@ -317,6 +320,11 @@
new HashMap<String, Object>() {{
put("processMethodVerify", exportWordTemplate);
put("processMethodVerifyMachineAttachmentList", processMethodVerifyMachineAttachmentList);
+ put("affirmUserUrl1",pictureRenderDataList.get(0));
+ put("affirmUserUrl2",pictureRenderDataList.get(1));
+ put("affirmUserUrl3",pictureRenderDataList.get(2));
+ put("affirmUserUrl4",pictureRenderDataList.get(3));
+ put("affirmUserUrl5",pictureRenderDataList.get(4));
}});
// 澶勭悊鎹㈣闂
@@ -347,7 +355,7 @@
// 锛堟枡锛夋槸鍚︽弧瓒�
processMethodVerifyExportWordDto.setMaterialIsSatisfiedStr(processMethodVerify.getMaterialIsSatisfied() == 1 ? "鈭�" : "脳");
// 锛堟硶锛夋槸鍚︽弧瓒�
- processMethodVerifyExportWordDto.setMethodIsSatisfiedStr(processMethodVerify.getMethodIsSatisfied() == 1? "鈭�" : "脳");
+ processMethodVerifyExportWordDto.setMethodIsSatisfiedStr(processMethodVerify.getMethodIsSatisfied() == 1 ? "鈭�" : "脳");
// 锛堢幆锛夋槸鍚︽弧瓒�
processMethodVerifyExportWordDto.setEnvironmentIsSatisfiedStr(processMethodVerify.getEnvironmentIsSatisfied() == 1 ? "鈭�" : "脳");
// 锛堟祴閲忔函婧愭�э級鏄惁婊¤冻
@@ -357,7 +365,7 @@
// 锛堝叾浠栵級鏄惁婊¤冻
processMethodVerifyExportWordDto.setOtherIsSatisfiedStr(processMethodVerify.getOtherIsSatisfied() == 1 ? "鈭�" : "脳");
// 纭鏃ユ湡
- processMethodVerifyExportWordDto.setConfirmDateStr(processMethodVerify.getConfirmDate() != null ? processMethodVerify.getConfirmDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")): null);
+ processMethodVerifyExportWordDto.setConfirmDateStr(processMethodVerify.getConfirmDate() != null ? processMethodVerify.getConfirmDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) : null);
return processMethodVerifyExportWordDto;
}
--
Gitblit v1.9.3