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 @@ jero-boot 2.4.2 pom - + org.springframework.boot spring-boot-starter-parent @@ -70,7 +70,7 @@ http://maven.hzwlsoft.com:4000/repository/maven-snapshots/ - + aliyun @@ -305,6 +305,18 @@ + + + + com.itextpdf + itextpdf + 5.5.10 + + + com.itextpdf + itext-asian + 5.2.0 + @@ -423,4 +435,4 @@ - \ No newline at end of file +