diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java index e25a44d..5fda1e0 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java @@ -497,4 +497,7 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable { @TableField(exist=false) private Integer isQualified; + @ApiModelProperty("是否线下 ： 1-线下，0-线上") + private Boolean isOffline; + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java index b785073..f0819e9 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java @@ -166,6 +166,21 @@ public class WorkTicketFinish implements Serializable { */ private String otherItems; + /** + * 工作终结负责人 + */ + private String endPrincipalName; + + /** + * 工作终结许可人 + */ + private String endLicensorName; + + /** + * 工作票终结许可人 + */ + private String finishLicensorName; + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 0d1e79c..29cda63 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -506,6 +506,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { } workTicket.setProcessInstanceId(response.getProcessInstanceId()); this.saveWorkTicket(workTicket,response); + firstWorkTicketService.updateById(workTicket); List safetyMeasuresList = workTicketVo.getSafetyMeasuresList(); if(CollectionUtil.isNotEmpty(safetyMeasuresList)) { workTicketSafetyMeasureService.saveOrUpdateBatch(safetyMeasuresList); @@ -1366,7 +1367,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { this.saveSafetyMeasures(workTicketVo.getSafetyMeasuresList(), workTicketVo.getWorkTicket()); this.saveWorkTicketContentDto(workTicketVo.getWorkTicketContentDtoList(), workTicketVo.getWorkTicket()); // 开启工作流 - String processInstanceId = this.startOfflineTicketProcess(workTicketVo); + this.startOfflineTicketProcess(workTicketVo); return workTicket.getId(); } diff --git a/hzims-service/ticket/src/main/resources/db/2.0.1.sql b/hzims-service/ticket/src/main/resources/db/2.0.1.sql new file mode 100644 index 0000000..4568f6b --- /dev/null +++ b/hzims-service/ticket/src/main/resources/db/2.0.1.sql @@ -0,0 +1,5 @@ +alter table `hzims_work_ticket_finish` add column `end_principal_name` varchar(50) comment '工作终结负责人'; +alter table `hzims_work_ticket_finish` add column `end_licensor_name` varchar(50) comment '工作终结许可人'; +alter table `hzims_work_ticket_finish` add column `finish_licensor_name` varchar(50) comment '工作票终结许可人'; + +alter table `hzims_work_ticket_info` add column `is_offline` tinyint(2) default 0 comment '是否线下 ： 1-线下，0-线上'; \ No newline at end of file diff --git a/hzims-service/ticket/src/main/resources/file/线下工作票审批流程.bpmn20.xml b/hzims-service/ticket/src/main/resources/file/线下工作票审批流程.bpmn20.xml index 4d87dfc..7660161 100644 --- a/hzims-service/ticket/src/main/resources/file/线下工作票审批流程.bpmn20.xml +++ b/hzims-service/ticket/src/main/resources/file/线下工作票审批流程.bpmn20.xml @@ -4,6 +4,7 @@ + @@ -11,6 +12,7 @@ + @@ -18,17 +20,20 @@ + - + + - + +