# 线下工作票预览接口调整

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;
+
 }

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;
+
 
 }
 

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<WorkTicketSafetyMeasureEntity> 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();
     }
 

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-线上';

hzims-service/ticket/src/main/resources/file/线下工作票审批流程.bpmn20.xml

@@ -4,6 +4,7 @@
     <startEvent id="startEvent1"></startEvent>
     <userTask id="sid-194BD702-29AE-4DA6-A343-05464D12BB83" name="签发人签发" flowable:candidateGroups="signer">
       <extensionElements>
+        <flowable:formProperty id="new_property_1" type="string" default="1"></flowable:formProperty>
         <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>
@@ -11,6 +12,7 @@
     <exclusiveGateway id="sid-C055B0CF-183B-4BFF-B9CA-D5C420311421"></exclusiveGateway>
     <userTask id="sid-2CCB5862-1AB2-4327-9FBE-A11DC613B258" name="运行人员接收" flowable:candidateGroups="operatingCrew">
       <extensionElements>
+        <flowable:formProperty id="new_property_1" type="string" default="2"></flowable:formProperty>
         <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>
@@ -18,17 +20,20 @@
     <sequenceFlow id="sid-2BD654BF-BFE4-481D-A710-185D10F7C413" sourceRef="sid-2CCB5862-1AB2-4327-9FBE-A11DC613B258" targetRef="sid-24261C82-08E4-4F0A-B069-5F2BB1E1ECEF"></sequenceFlow>
     <userTask id="sid-33C2D3CB-1B69-4234-9AE9-3747F37BE8C5" name="许可人许可" flowable:candidateGroups="licensor">
       <extensionElements>
+        <flowable:formProperty id="new_property_1" type="string" default="3"></flowable:formProperty>
         <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>
-    <userTask id="sid-1D70C4B2-A79B-4C02-AA30-9D755484C4B6" name="工作结束">
+    <userTask id="sid-1D70C4B2-A79B-4C02-AA30-9D755484C4B6" name="工作结束" flowable:candidateGroups="licensor">
       <extensionElements>
+        <flowable:formProperty id="new_property_1" type="string" default="4"></flowable:formProperty>
         <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-9FDA7FDD-A163-4496-B850-77C7A44C3F1F" sourceRef="sid-33C2D3CB-1B69-4234-9AE9-3747F37BE8C5" targetRef="sid-1D70C4B2-A79B-4C02-AA30-9D755484C4B6"></sequenceFlow>
-    <userTask id="sid-7A6326EA-6129-47EF-88D1-0FC14033B25A" name="工作票终结">
+    <userTask id="sid-7A6326EA-6129-47EF-88D1-0FC14033B25A" name="工作票终结" flowable:candidateGroups="licensor">
       <extensionElements>
+        <flowable:formProperty id="new_property_1" type="string" default="5"></flowable:formProperty>
         <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>