From 79c4014ed3079af5ed32f144fc83b4456ecb7f33 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 23 May 2022 20:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20=E5=AF=BC=E5=87=BApdf=E4=B8=B4=E6=97=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=20=E8=AE=BE=E7=BD=AE=20=E3=80=81=20?=
 =?UTF-8?q?=E4=BB=BF=E5=AE=8B=E4=BD=93=E5=AD=97=E4=BD=93=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=20=E8=AE=BE=E7=BD=AE=20=E5=A2=9E=E5=8A=A0iTe?=
 =?UTF-8?q?xt=E5=AF=BC=E5=87=BApdf=E6=96=87=E4=BB=B6=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../4.数据库变更记录/王志江sql变更记录.sql     |  8 ++++++++
 .../project/entity/ProjectTaskInventoryEO.java |  6 ++++++
 .../wkflow/entity/ProcessHistoryEO.java        |  3 +++
 .../src/main/resources/application-dev.yml     |  4 ++++
 jero-boot/pom.xml                              | 18 +++++++++++++++---
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/SynologyDrive/4.数据库变更记录/王志江sql变更记录.sql b/SynologyDrive/4.数据库变更记录/王志江sql变更记录.sql
index e69de29bb..fbeffdd7d 100644
--- a/SynologyDrive/4.数据库变更记录/王志江sql变更记录.sql
+++ b/SynologyDrive/4.数据库变更记录/王志江sql变更记录.sql
@@ -0,0 +1,8 @@
+-- 2022 05 23
+--任务清单表，增加流程结束时间， 三个流程里最后一个流程结束的时间，后续导出pdf报告时用到
+ALTER TABLE project_task_inventory
+    ADD COLUMN `process_end_time` datetime NULL COMMENT '流程结束时间-最终时间' AFTER `verify_person_charge_feedback`;
+
+--流程历史表，增加法规清单id字段关联  后续导出pdf报告时用到
+ALTER TABLE process_history
+    ADD COLUMN `project_laws_inventory_id` varchar(64) NULL COMMENT '法规清单id' AFTER `approval_opinion`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
index 71b0c542c..814481dcc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
@@ -297,4 +297,10 @@ public class ProjectTaskInventoryEO implements Serializable {
     private String prehomoPersonChargeFeedback;
     /**验证符合性 责任人填写反馈意见**/
     private String verifyPersonChargeFeedback;
+
+    /**流程结束时间 最后的时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "流程结束时间 最后的时间")
+    private Date processEndTime;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
index b3f1f595b..f91cb062a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
@@ -98,5 +98,8 @@ public class ProcessHistoryEO implements Serializable {
     @TableField(exist = false)
     private String name;;
 
+    @ApiModelProperty(value = "法规清单id")
+    private String projectLawsInventoryId;
+
 
 }
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index b2f48e359..52bf174cc 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -198,6 +198,10 @@ jero :
     img: D://opt//upFiles/
     #webapp文件路径
     webapp: D://opt//webapp
+    #导出pdf临时文件路径 设置
+    exportPdfTempPath: D://opt//exportPdfTemp/
+    #仿宋体字体文件路径 设置
+    simfangFontFilePath: D://opt//simfangFontFilePath//simfang.ttf
   shiro:
     excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储配置
diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml
index 03f69efbe..7fbb1b1d6 100644
--- a/jero-boot/pom.xml
+++ b/jero-boot/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>jero-boot</artifactId>
   <version>2.4.2</version>
   <packaging>pom</packaging>
-  
+
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-parent</artifactId>
@@ -70,7 +70,7 @@
 			<url>http://maven.hzwlsoft.com:4000/repository/maven-snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
-	
+
 	<repositories>
 		<repository>
             <id>aliyun</id>
@@ -305,6 +305,18 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+
+			<!-- pdf打印 -->
+			<dependency>
+				<groupId>com.itextpdf</groupId>
+				<artifactId>itextpdf</artifactId>
+				<version>5.5.10</version>
+			</dependency>
+			<dependency>
+				<groupId>com.itextpdf</groupId>
+				<artifactId>itext-asian</artifactId>
+				<version>5.2.0</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -423,4 +435,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>