From 46929f181707162f21eb6e7735350969097fe21d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 23 七月 2025 20:52:34 +0800
Subject: [PATCH] 增加字典查询接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
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..724d012 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);
}
@@ -68,6 +69,9 @@
List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getProcessInstanceId, processInstanceId).orderByAsc(ApproveRecord::getCreateTime).list();
for(int i=0;i<records.size();i++){
ApproveRecord record = records.get(i);
+ if(record.getNcProgramId() ==null){
+ continue;
+ }
printStep(document,bfChinese,record);
if(i<records.size()-1){
document.newPage();
@@ -155,10 +159,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 +207,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%
--
Gitblit v1.9.3