From 833e909fbb25dd1245ec6aabb0c2cbe4c72d31c7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 22 七月 2025 14:54:13 +0800
Subject: [PATCH] 审批表打印
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java | 22 ++++++++++++++++++----
doc/sql/mdm/mdm.mysql.all.create.sql | 6 ++++--
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
index 52732ab..4e88db8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
@@ -64,7 +64,7 @@
ApproveRecord rec = new ApproveRecord();
rec.setTaskName(task.getName());
rec.setTaskDefinitionId(task.getTaskDefinitionId());
- ;
+
rec.setComment(comment==null? StringUtils.EMPTY:comment);
rec.setProcessInstanceId(processInstanceId);
rec.setProcessDefinitionKey(processDefinitionKey);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
index 14566e6..530f8b9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Date;
import java.util.List;
import com.itextpdf.text.*;
import com.itextpdf.text.pdf.*;
@@ -44,7 +45,7 @@
private static final String CHECKED_BOX = "鈽�";
static Chunk square = new Chunk("o", new Font(Font.FontFamily.ZAPFDINGBATS, 12)); // 绌烘柟妗�
static Chunk check = new Chunk("4", new Font(Font.FontFamily.ZAPFDINGBATS, 12)); // 甯﹀嬀鏂规
-
+ //static SimpleDateFormat
BaseFont getBaseFont() throws DocumentException, IOException {
return BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
}
@@ -155,10 +156,14 @@
String personName = record.getUserNickname();
Chunk block1 = square;
Chunk block2 = square;
+ Date programDate = null;
+ Date checkDate = null;
if(StringUtils.equals(record.getTaskDefinitionId(),"programmingTask")){
block1 = check;
+ programDate = record.getCreateTime();
}else if(StringUtils.equals(record.getTaskDefinitionId(),"check")){
block2 = check;
+ checkDate = record.getCreateTime();
}
Phrase p = new Phrase(" "+personName+" ",underLineFt);
@@ -199,11 +204,20 @@
table.addCell(getCell("鎵瑰噯/鏃ユ湡",ft));
PdfPCell cell2 = new PdfPCell();
- cell2.addElement(new Phrase(" ",ft));
cell2.setColspan(2);
+ cell2.addElement(new Phrase(ncProgram.getCode(),ft));//鏁版帶绋嬪簭缂栧彿
table.addCell(cell2);
- table.addCell(getCell(" ",ft));
- table.addCell(getCell(" ",ft));
+
+ String pDateStr = " ";
+ if(programDate!=null){
+ pDateStr = DateUtil.format(programDate,"yyyy-MM-dd");
+ }
+ String checkDateStr = " ";
+ if(checkDate!=null){
+ checkDateStr = DateUtil.format(programDate,"yyyy-MM-dd");
+ }
+ table.addCell(getCell(pDateStr,ft));//缂栧埗鏃ユ湡
+ table.addCell(getCell(checkDateStr,ft));
table.addCell(getCell(" ",ft));
// 璁剧疆琛ㄦ牸瀹藉害鍗犻〉闈㈠搴︾殑100%
diff --git a/doc/sql/mdm/mdm.mysql.all.create.sql b/doc/sql/mdm/mdm.mysql.all.create.sql
index 5ebce10..308f19a 100644
--- a/doc/sql/mdm/mdm.mysql.all.create.sql
+++ b/doc/sql/mdm/mdm.mysql.all.create.sql
@@ -100,13 +100,14 @@
`oss_name` varchar(100) NULL COMMENT 'oss涓殑鏂囦欢鍚�',
`category` varchar(20) NULL COMMENT '鏂囦欢鍒嗙被',
`process_name` varchar(20) NULL COMMENT '宸ュ簭鍚嶇О',
+ `process_no` varchar(20) NULL COMMENT '宸ュ簭鍙�',
`remark` varchar(100) NULL COMMENT '澶囨敞',
`is_text_file` int DEFAULT NULL COMMENT '鏄惁鏂囨湰鏂囦欢',
`url` varchar(400) NOT NULL COMMENT '鏂囦欢鍦板潃',
`machine_code` varchar(100) DEFAULT NULL COMMENT '璁惧缂栧彿/鏈哄簥缂栧彿',
`drawing_no` varchar(100) NULL COMMENT '闆剁粍浠剁紪鍙�/鍥惧彿',
`drawing_no_edition` varchar(100) NULL COMMENT '鍥惧彿鐗堟',
- `craft_edition` varchar(20) NULL COMMENT '璁捐鐗堟',
+ `craft_edition` varchar(20) NULL COMMENT '宸ヨ壓鐗堟',
`description` varchar(100) NULL COMMENT '鎻忚堪',
`is_cured` int DEFAULT NULL COMMENT '鏄惁鍥哄寲,1鏄�;0鍚�',
`expire_date` date DEFAULT NULL COMMENT '鍒版湡鏃堕棿,鏍规嵁鏈夋晥鏈熸椂闀胯绠楄�屾潵',
@@ -155,7 +156,8 @@
`nc_program_id` bigint NULL COMMENT '绋嬪簭id銆傛湭閫夋嫨绋嬪簭涔嬪墠鏄痭ull',
`process_instance_id` varchar(64) DEFAULT NULL COMMENT '娴佺▼瀹炰緥id',
`process_definition_key` varchar(100) DEFAULT NULL COMMENT '娴佺▼瀹氫箟key',
- `task_name` varchar(100) DEFAULT NULL COMMENT '浠诲姟鍚嶇О',
+ `task_definition_key` varchar(100) DEFAULT NULL COMMENT '浠诲姟瀹氫箟key',
+ `task_name` varchar(100) DEFAULT NULL COMMENT '浠诲姟鍚嶇О',
`operate_time` datetime DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
`operate_result` varchar(20) DEFAULT NULL COMMENT '瀹℃壒缁撴灉',
`user_id` bigint NOT NULL COMMENT '瀹℃壒鐢ㄦ埛id',
--
Gitblit v1.9.3