From bd961491fb449a92e7c357376073e138f99c5a29 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 12:15:22 +0800
Subject: [PATCH] refactor(seal): 重构用印管理与申请模块并优化交互体验
---
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java | 15 +++++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java
index a8f4255..74f35b1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java
@@ -80,11 +80,11 @@
if (instance == null || instance.isBlank()) throw fail("瀹℃壒璁板綍涓嶅畬鏁达紝鏃犳硶涓嬭浇");
boolean humanApproval = taskService.getTaskListByProcessInstanceId(instance, true).stream().anyMatch(task -> {
var vars = task.getTaskLocalVariables();
- if (vars == null || !Integer.valueOf(2).equals(vars.get("TASK_STATUS")) || task.getAssignee() == null || task.getAssignee().equals(String.valueOf(userId))) return false;
+ if (vars == null || !Integer.valueOf(2).equals(vars.get("TASK_STATUS")) || task.getAssignee() == null) return false;
Object reason = vars.get("TASK_REASON");
return Arrays.stream(cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum.values()).noneMatch(item -> Objects.equals(item.getReason(), reason));
});
- if (!humanApproval) throw fail("鏈壘鍒板叾浠栧鎵逛汉鐨勪汉宸ラ�氳繃璁板綍锛屾棤娉曚笅杞�");
+ if (!humanApproval) throw fail("鏈壘鍒颁汉宸ュ鎵归�氳繃璁板綍锛屾棤娉曚笅杞�");
byte[] snapshot=(byte[])rows.get(0).get("document_snapshot"), image=(byte[])rows.get(0).get("seal_image");
var out=new ByteArrayOutputStream(); boolean found=false;
try(var zin=new ZipInputStream(new ByteArrayInputStream(snapshot)); var zout=new ZipOutputStream(out)) { ZipEntry entry; while((entry=zin.getNextEntry())!=null){byte[] bytes=zin.readAllBytes(); if(entry.getName().equals("word/media/seal.png")){bytes=image;found=true;} zout.putNextEntry(new ZipEntry(entry.getName())); zout.write(bytes); zout.closeEntry();} }
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java
index 02fb810..388383d 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java
@@ -34,6 +34,21 @@
when(tasks.getTaskListByProcessInstanceId("p",true)).thenReturn(List.of(task));
assertThrows(ServiceException.class, () -> service.download(1,7));
}
+ @Test void allowsManualApprovalByApplicant() throws Exception {
+ var buffer = new ByteArrayOutputStream();
+ try (var zip = new ZipOutputStream(buffer)) {
+ zip.putNextEntry(new ZipEntry("word/media/seal.png"));
+ zip.write(new byte[]{1});
+ zip.closeEntry();
+ }
+ when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(List.of(Map.of(
+ "process_instance_id", "p", "document_snapshot", buffer.toByteArray(), "seal_image", new byte[]{2})));
+ HistoricTaskInstance task = mock(HistoricTaskInstance.class);
+ when(task.getAssignee()).thenReturn("7");
+ when(task.getTaskLocalVariables()).thenReturn(Map.of("TASK_STATUS", 2, "TASK_REASON", ""));
+ when(tasks.getTaskListByProcessInstanceId("p", true)).thenReturn(List.of(task));
+ assertNotNull(service.download(1, 7));
+ }
@Test void approvedDownloadEmbedsSelectedImage() throws Exception {
var buffer=new ByteArrayOutputStream();
try(var zip=new ZipOutputStream(buffer)){zip.putNextEntry(new ZipEntry("word/media/seal.png"));zip.write(new byte[]{1});zip.closeEntry();}
--
Gitblit v1.9.3