Merge remote-tracking branch 'origin/master'

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java

@@ -50,6 +50,7 @@ public class StationEntity extends TenantEntity implements Serializable {
 	@QueryField(condition = SqlCondition.EQUAL)
 	private String areaCode;
 
+
 	@ApiModelProperty("上属机构")
 	@QueryField(condition = SqlCondition.EQUAL)
 	private Long higherDept;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ticket/fallback/StationFeginServiceFallback.java

@@ -0,0 +1,10 @@
+package com.hnac.hzims.operational.ticket.fallback;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/26 15:04
+ */
+public class StationFeginServiceFallback {
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ticket/fegin/StationFeginService.java

@@ -0,0 +1,16 @@
+package com.hnac.hzims.operational.ticket.fegin;
+
+import com.hnac.hzims.operational.ticket.fallback.StationFeginServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+
+import static com.hnac.hzims.operational.OperationalConstants.APP_NAME;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/26 15:03
+ */
+//@FeignClient(value = APP_NAME,fallback = StationFeginServiceFallback.class)
+public interface StationFeginService {
+}

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java

@@ -31,130 +31,363 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+    /**
+     * 工作流ID
+     */
     @ApiModelProperty(value = "工作流ID")
     @QueryField(condition = SqlCondition.EQUAL)
     private String processInstanceId;
 
+
+    /**
+     * 附页第几章
+     */
+    @ApiModelProperty("附页第几章")
+    private Integer followerNum;
+
+
+    /**
+     * 设备code
+     */
     @ApiModelProperty(value = "设备code")
     @QueryField(condition = SqlCondition.EQUAL)
     private String emCode;
 
+    /**
+     * 设备名称
+     */
     @ApiModelProperty(value = "设备名称")
     @QueryField(condition = SqlCondition.LIKE)
     private String emName;
 
+    /**
+     * 工作票类型
+     */
     @ApiModelProperty(value = "工作票类型")
     @QueryField(condition = SqlCondition.EQUAL)
     private String type;
 
+
+    /**
+     * 票据模板
+     */
+    @ApiModelProperty("票据模板")
+    private String ticketTemplate;
+
+
+    /**
+     * 单位
+     */
     @ApiModelProperty(value = "单位")
     @QueryField(condition = SqlCondition.LIKE)
     private String company;
 
+
+    /**
+     * 编号
+     */
     @ApiModelProperty(value = "编号")
     @QueryField(condition = SqlCondition.LIKE)
     private String code;
 
+
+    /**
+     * 关联业务类型
+     */
     @ApiModelProperty(value = "关联业务类型")
     @QueryField(condition = SqlCondition.EQUAL)
     private String taskType;
 
+
+    /**
+     * 关联业务ID
+     */
     @ApiModelProperty(value = "关联业务ID")
     @QueryField(condition = SqlCondition.EQUAL)
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Long taskId;
 
+    /**
+     * 关联业务名称
+     */
     @ApiModelProperty("关联业务名称")
     @QueryField(condition = SqlCondition.LIKE)
     private String taskName;
 
+
+    /**
+     * 班组
+     */
     @ApiModelProperty(value = "班组")
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Long classGroup;
 
+
+    /**
+     * 班组名称
+     */
     @ApiModelProperty("班组名称")
     private String classGroupName;
 
+
+    /**
+     * 班组成员
+     */
     @ApiModelProperty(value = "班组成员")
     private String classGroupMembers;
 
+
+    /**
+     * 班组成员手填
+     */
     @ApiModelProperty(value = "班组成员手填")
     private String classGroupMembersManual;
 
+
+    /**
+     * 班组成员名称
+     */
+    @ApiModelProperty(value = "班组成员名称")
+    private String classGroupMembersName;
+
+
+    /**
+     * 工作地点及设备名称
+     */
     @ApiModelProperty(value = "工作地点及设备名称")
     private String addressEquName;
 
+
+    /**
+     * 工作任务及内容
+     */
     @ApiModelProperty(value = "工作任务及内容")
     private String workContent;
 
+
+    /**
+     * 计划开始时间
+     */
     @ApiModelProperty(value = "计划开始时间")
-	@DateTimeFormat(
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
     private LocalDateTime planStartTime;
 
+    /**
+     * 计划结束时间
+     */
     @ApiModelProperty(value = "计划结束时间")
-	@DateTimeFormat(
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
     private LocalDateTime planEndTime;
 
+
+    /**
+     * 签发人
+     */
     @ApiModelProperty(value = "签发人")
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Long signer;
 
+
+    /**
+     * 签发人签发时间
+     */
+    @ApiModelProperty(value = "签发人签发时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime signerDateTime;
+
+
+    /**
+     * 负责人
+     */
     @ApiModelProperty(value = "负责人")
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Long principal;
 
+    /**
+     * 手填值班负责人
+     */
     @ApiModelProperty(value = "手填值班负责人")
     private String principalManual;
 
+
+    /**
+     * 负责人名称
+     */
+    @ApiModelProperty(value = "负责人名称")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String principalName;
+
+
+    /**
+     * 许可人
+     */
     @ApiModelProperty(value = "许可人")
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Long licensor;
 
+    /**
+     * 许可时间
+     */
     @ApiModelProperty(value = "许可时间")
-	@DateTimeFormat(
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
     private LocalDateTime licenseTime;
 
+
+    /**
+     * 工作负责人确认工作完成上传图片地址
+     */
     @ApiModelProperty("工作负责人确认工作完成上传图片地址")
     private String confirmImgUrls;
 
+    /**
+     * 工作负责人确认工作完成上传图片名称
+     */
     @ApiModelProperty("工作负责人确认工作完成上传图片名称")
     private String confirmImgFilenames;
 
-	@DateTimeFormat(
+
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    /**
-	)
+     * 工作负责人确认工作完成时间
-	@JsonFormat(
+     */
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("工作负责人确认工作完成时间")
     private LocalDateTime confirmWorkTime;
 
-	@DateTimeFormat(
+
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    /**
-	)
+     * 许可人确认工作结束时间
-	@JsonFormat(
+     */
-		pattern = "yyyy-MM-dd HH:mm:ss"
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "许可人确认工作结束时间")
     private LocalDateTime licenseEndTime;
 
+
     @ApiModelProperty("是否评价")
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Integer isEvaluate;
 
+
+    /**
+     * 值班负责人
+     */
+    @ApiModelProperty("值班负责人")
+    private Long watchPrincipal;
+
+
+    /**
+     * 批准工作结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("批准工作结束时间")
+    private LocalDateTime watchPrincipalEndTime;
+
+
+    /**
+     * 开工时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("开工时间")
+    private LocalDateTime startDateTime;
+
+
+    /**
+     * 收工时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("收工时间")
+    private LocalDateTime endDateTime;
+
+
+    /**
+     * 工作票结束时间
+     */
+    @ApiModelProperty("工作票结束时间")
+    private LocalDateTime workTicketEndTime;
+
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String content;
+
+
+    /**
+     * 交底内容
+     */
+    @ApiModelProperty("交底内容")
+    private String tellContent;
+
+
+    /**
+     * 工作条件（false 停电  true 不停电）
+     */
+    @ApiModelProperty("工作条件（false 停电  true 不停电）")
+    private Boolean isPower;
+
+
+    /**
+     * 流程状态'
+     */
+    @ApiModelProperty("流程状态")
+    private Integer flowStatus;
+
+    /**
+     * 流程描述
+     */
+    @ApiModelProperty("流程描述")
+    private String flowDescription;
+
+
+    /**
+     * AA/AAA/AAAA由建站时建站人填写必须系统验证唯一性
+     * 站点标识-两票编码
+     */
+    @ApiModelProperty("站点标识-两票编码")
+    private String signage;
+
+
+    /**
+     * 编号（原站点ID）
+     */
+    @ApiModelProperty("编号（原站点ID）")
+    private String  signageCode;
+
+
+    /**
+     *  开票时间
+     */
+    @ApiModelProperty("开票时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime makeDateTime;
+    /**
+     * 共几人
+     */
+    @ApiModelProperty("共几人")
+    private Integer totalPerson;
+
+
+    /**
+     * 负责人确认安全措施时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private  LocalDateTime confirmDateTime;
+
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime issuerReviewDateTime;
+
 }

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketSafetyMeasureEntity.java

@@ -93,4 +93,5 @@ public class WorkTicketSafetyMeasureEntity extends TenantEntity implements Seria
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer sort;
 
+
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationClient.java

@@ -128,6 +128,11 @@ public class StationClient implements IStationClient {
 		return R.data(stationService.getOne(request));
 	}
 
+
+
+
+
+
 	@Override
 	@PostMapping("/getStationByCodeOrRedDept")
 	@ApiOperation("根据条件查询单个站点")

hzims-service/ticket/pom.xml

@@ -20,6 +20,7 @@
         <poi.version>3.15</poi.version>
         <easypoi.version>3.2.0</easypoi.version>
         <documents4j.version>1.0.3</documents4j.version>
+        <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
     </properties>
 
     <dependencies>
@@ -277,6 +278,18 @@
 <!--            <version>4.2.0</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
+
+        <!--swagger-bootstrap-ui-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>${swagger-bootstrap-ui.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>hzims-operational-api</artifactId>
+        </dependency>
     </dependencies>
 
     <repositories>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/config/Swagger2Config.java

@@ -0,0 +1,60 @@
+package com.hnac.hzims.ticket.config;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import com.google.common.base.Predicates;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/13 13:40
+ */
+//@Configuration
+//@EnableSwagger2
+public class Swagger2Config implements WebMvcConfigurer {
+
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/**")
+                .addResourceLocations("classpath:/static/");
+        registry.addResourceHandler("doc.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+
+
+    @Bean
+    public Docket webApiConfig(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("工作票")
+                .apiInfo(webApiInfo())
+                .select()
+                //只显示api路径下的页面
+                .paths(Predicates.and(PathSelectors.regex("/ticket-process/.*")))
+                .build();
+
+    }
+
+    private ApiInfo webApiInfo() {
+        return new ApiInfoBuilder()
+                .title("网站-API文档")
+                .description("本文档描述了网站微服务接口定义")
+                .version("1.0")
+                .contact(new Contact("WL", "http://localhost:8501/", "55317332@qq.com"))
+                .build();
+    }
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/CodeGenerator.java

@@ -42,7 +42,7 @@
 //
 // 		// 包配置
 // 		PackageConfig pc = new PackageConfig();
-// 		pc.setModuleName("processflow");
+// 		pc.setModuleName("p");
 // 		pc.setParent("com.hnac.hzims.ticket");
 // 		mpg.setPackageInfo(pc);
 //
@@ -93,7 +93,7 @@
 // 		// strategy.setSuperControllerClass("你自己的父类控制器,没有就不用设置!");
 // 		// 写于父类中的公共字段
 // 		// strategy.setSuperEntityColumns("id");
-// 		strategy.setInclude("hzims_process_type");
+// 		strategy.setInclude("hzims_work_ticket_finish");
 // 		strategy.setControllerMappingHyphenStyle(true);
 // 		strategy.setTablePrefix("hzims_");
 // 		mpg.setStrategy(strategy);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java

@@ -11,5 +11,5 @@ package com.hnac.hzims.ticket.processflow.constant;
 public class TicketProcessConstant {
 
     // public final static String STARTEVENT = "startEvent1";
-     public final static String STARTEVENT = "newFirstWorkTicket";
+     public final static String STARTEVENT = "workTicket";
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java

@@ -107,7 +107,7 @@ public class ProcessTypeController {
         workTicketMessageResponse.setTaskId("1");
         workTicketMessageResponse.setProcessDefinitionKey("newFirstWorkTicket");
         workTicketMessageResponse.setTaskName("签发人签发");
-        workTicketMessageResponse.setFormData("1");
+        workTicketMessageResponse.setVariables("1");
         String qqqq = JsonUtil.toJson(workTicketMessageResponse);
         queueProduceService.sendMessage("blade:queue:flow", qqqq);
     }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/core/ProcessIdWorker.java

@@ -3,12 +3,15 @@ package com.hnac.hzims.ticket.processflow.strategy.core;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
 import java.text.NumberFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -22,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @Serial 1.0
  * @Date 2023/3/27 10:11
  */
+@Slf4j
 @Component
 public class ProcessIdWorker {
 
@@ -49,7 +53,7 @@ public class ProcessIdWorker {
      * @param typeInstrument 票据种类，第一种票，第二种票
      * @param yearMonth      开票时间年月
      */
-	public String getTicketCode(String staff, String typeInstrument, String yearMonth) {
+    private String getTicketCode(String staff, String typeInstrument, String yearMonth) {
         ValueOperations<String, String> operations = redisTemplate.opsForValue();
         AtomicInteger atomicInteger = new AtomicInteger(1);
         String key = staff + ":" + typeInstrument + ":" + yearMonth;
@@ -71,8 +75,9 @@ public class ProcessIdWorker {
 
         //生成 票据排序 格式 001 010 111
         int code = getYearMonthCode(originalYearMonth, yearMonth, key, sequencing);
-
+        //获取编码信息
         String result = getTicketCode(staff, typeInstrument, yearMonth, code);
+        log.info("获取编码信息 {}", result);
         return result;
     }
 
@@ -80,7 +85,7 @@ public class ProcessIdWorker {
     /**
      * 生成的票据 编号
      */
-	public String getTicketCode(String staff, String typeInstrument, String YearMonth, int sequencing) {
+    private String getTicketCode(String staff, String typeInstrument, String YearMonth, int sequencing) {
         return staff.concat("-").concat(typeInstrument).concat("-").concat(YearMonth).concat("-").concat(numberFormatter.format(sequencing));
     }
 
@@ -160,17 +165,38 @@ public class ProcessIdWorker {
 
     /**
      * 按规则生成票据编码：票据编码：AA-BB-CCCC-DDD格式
+     *
      * @param staff          AA在建站之初由接站人员填写要求唯一
      * @param typeInstrument 票据种类，第一种票，第二种票
      * @param year           年
      * @param month          月
      * @return
      */
-	public String getTicketCode(String staff, String typeInstrument, String year,String month){
+    private String getTicketCode(String staff, String typeInstrument, String year, String month) {
         String yearMonth = year.substring(year.length() - 2) + month;
         return getTicketCode(staff, typeInstrument, yearMonth);
     }
 
+
+    /**
+     * 按规则生成票据编码：票据编码：AA-BB-CCCC-DDD格式
+     *
+     * @param staff          AA在建站之初由接站人员填写要求唯一
+     * @param typeInstrument 票据种类，第一种票，第二种票
+     * @param createTime     开票时间   YYYY-MM-dd HH:mm:ss
+     * @return
+     */
+    public String getTicketByCode(String staff, String typeInstrument, LocalDateTime createTime) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String format = createTime.format(dateTimeFormatter);
+        String year = format.substring(0, 4);
+        log.info("获取年份信息: {}", year);
+        String month = format.substring(5, 7);
+        log.info("获取月份信息: {}", month);
+        return getTicketCode(staff, typeInstrument, year, month);
+    }
+
+
     @Data
     public static class TicketCode {
 
@@ -184,4 +210,5 @@ public class ProcessIdWorker {
         private AtomicInteger sequencing = new AtomicInteger(1);
     }
 
+
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MakeProcessServiceImpl.java

@@ -8,6 +8,7 @@ import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -54,7 +55,6 @@ public class MakeProcessServiceImpl extends ProcessAbstractService {
 	 */
 	@Override
 	public void calculate(ProcessWorkFlowResponse response) {
-		log.info("启动开票流程环节....");
+		ticketProcessService.findPending(response);
-		ticketProcessService.startUp(response);
 	}
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/response/ProcessWorkFlowResponse.java

@@ -45,7 +45,9 @@ public class ProcessWorkFlowResponse implements Serializable {
 	 */
 	private String nextStepOperator;
 
+
+
 	/**票据表单**/
-	private String formData;
+	private String variables;
 
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -70,7 +71,7 @@ public class StandardWorkTicketController {
 	@ApiOperation("测试生成唯一编码")
 	@GetMapping("/idWored")
 	public R idWored() {
-		String ticketCode = standardTicketIdWorker.getTicketCode("aa", "bb", "2304");
+		String ticketCode = standardTicketIdWorker.getTicketByCode("aa", "bb", LocalDateTime.now());
 		return R.data(ticketCode);
 	}
 

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java

@@ -0,0 +1,49 @@
+package com.hnac.hzims.ticket.twoTicket.controller;
+
+import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
+import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 工作票
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/23 10:34
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "新工作票")
+@RequestMapping("/ticket-process")
+public class TicketProcessController {
+
+
+    @Autowired
+    private TicketProcessService ticketProcessService;
+
+
+    /**
+     * 启动流程
+     * @return
+     */
+    @ApiOperation("启动流程")
+    @PostMapping("/startUp")
+    public R start(@RequestBody WorkTicketVo workTicketVo) {
+        ticketProcessService.startUp(workTicketVo);
+        return R.success("启动流程成功");
+    }
+
+
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/WorkTicketFinishController.java

@@ -0,0 +1,20 @@
+package com.hnac.hzims.ticket.twoTicket.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 工作结束 前端控制器
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-04-24
+ */
+@RestController
+@RequestMapping("/p/work-ticket-finish")
+public class WorkTicketFinishController {
+
+}
+

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java

@@ -0,0 +1,146 @@
+package com.hnac.hzims.ticket.twoTicket.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 工作结束
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-04-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hzims_work_ticket_finish")
+public class WorkTicketFinish implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 工作票编号
+     */
+    @ApiModelProperty("工作票编号")
+    @TableField("ticket_id")
+    private Long ticketId;
+
+    /**
+     * 临时接地线
+     */
+    @ApiModelProperty("临时接地线")
+    @TableField("temp_ground_num")
+    private Integer tempGroundNum;
+
+    /**
+     * 临时拆除几组
+     */
+    @ApiModelProperty("临时拆除几组")
+    @TableField("temp_dismantle_num")
+    private Integer tempDismantleNum;
+
+    /**
+     * 接地线几组
+     */
+    @ApiModelProperty("接地线几组")
+    @TableField("ground_num")
+    private Integer groundNum;
+
+    /**
+     * 拆除几组
+     */
+    @ApiModelProperty("拆除几组")
+    @TableField("dismantle_num")
+    private Integer dismantleNum;
+
+    /**
+     * 保留几组
+     */
+    @ApiModelProperty("拆除几组")
+    @TableField("retain_num")
+    private Integer retainNum;
+
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 负责人名称
+     */
+    @ApiModelProperty("负责人名称")
+    @TableField("principal")
+    private Long principal;
+
+
+
+    /**
+     * 许可人
+     */
+    @ApiModelProperty("许可人")
+    @TableField("licensor")
+    private Long licensor;
+
+
+
+    /**
+     * 负责人工作结束时间
+     */
+    @ApiModelProperty("负责人工作结束时间")
+    private LocalDateTime principalEndTime;
+
+
+    /**
+     * 工作票终结时间
+     */
+    @ApiModelProperty("工作票终结时间")
+    private LocalDateTime licensorEndTime;
+
+
+    /**
+     * 结束时间
+     */
+    private  LocalDateTime workEndTime;
+
+
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String content;
+
+    /**
+     * 交底内容
+     */
+    @ApiModelProperty("交底内容")
+    private String  tellContent;
+
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/enums/FlowWorkTicketConstants.java

@@ -0,0 +1,97 @@
+package com.hnac.hzims.ticket.twoTicket.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/3/24 11:34
+ */
+public enum FlowWorkTicketConstants {
+    /**
+     * 开票
+     */
+    START(1, "开票"),
+    /**
+     * 签发人签发
+     */
+    SIGN(2, "签发人签发"),
+    /**
+     * 运行人员接收
+     */
+    RECEIVE(3,"运行人员接收"),
+    /**
+     * 运行人员布置安全措施
+     */
+    FIX_UP(4 ,"运行人员布置安全措施"),
+    /**
+     * 工作负责人确认安全措施
+     */
+    PRINCIPAL_CONFIRM_MEASURE(5 ,"工作负责人确认安全措施"),
+
+    /**
+     * 许可人许可
+     */
+    LICENCE(6,"许可人许可"),
+
+
+
+    /**
+     * 工作负责人确认工作内容执行
+     */
+    PRINCIPAL_CONFIRM_CONTENT(6, "工作负责人确认工作内容执行"),
+
+    /**
+     * 工作负责人确认工作票结束
+     */
+    PRINCIPAL_CONFIRM_END(7,  "工作负责人确认工作票结束、终结"),
+
+
+    /**
+     * 许可人确认工作票结束
+     */
+    LICENSE_CONFIRM_END(9,  "许可人确认工作票结束、终结"),
+
+    /**
+     * 签发人审核
+     */
+    SIGN_CONFIRM_DELAY(10,  "签发人审核"),
+
+    /**
+     * 工作票转移
+     */
+    PROCESS_COURSE(12 , "工作票转移"),
+    /**
+     * 工作票延期
+     */
+    PROCESS_POSTPONE(13,  "工作票延期"),
+
+    /**
+     * 结束
+     */
+    END(14,"流程结束");
+
+    @Getter
+    private Integer status;
+
+    @Getter
+    private String description;
+
+    FlowWorkTicketConstants(Integer status, String description) {
+        this.status = status;
+        this.description = description;
+    }
+
+
+    public static FlowWorkTicketConstants getEnumByStatus(Integer status) {
+        Optional<FlowWorkTicketConstants> statusOptional = Arrays.stream(FlowWorkTicketConstants.class.getEnumConstants())
+                .filter(e -> status.equals(e.getStatus())).findAny();
+        return statusOptional.orElse(null);
+    }
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/enums/TwoWorkTicketStatusEnum.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.ticket.twoTicket.enums;
+
+import com.hnac.hzims.ticket.constants.WorkTicketConstants;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/24 17:19
+ */
+@AllArgsConstructor
+public enum TwoWorkTicketStatusEnum {
+
+    /**签发**/
+    SIGN(1,"签发"),
+    /**收到工作票**/
+    RECEIVE(2,"收到工作票"),
+    /**许可人许可**/
+    LICENSE(3,"许可人许可"),
+    /**确认条件具备**/
+    CONFIRM_MEASURE(4,"确认条件具备"),
+    /**工作负责人确认工作**/
+    CONFIRM_WORK(5,"工作负责人确认工作"),
+    /**许可人确认工作结束**/
+    WORK_FINISH(6,"许可人确认工作结束"),
+    /**工作票终结**/
+    TICKET_FINISH(7,"工作票终结"),
+    /**结束**/
+    FINISH(8,"结束"),
+    /**许可人延期确认**/
+    LICENSE_DELAY(9,"许可人延期确认"),
+    /**负责人延期确认**/
+    CONFIRM_DELAY(10,"负责人延期确认"),
+    /**作废**/
+    INVALID(11,"作废"),
+    /**逾期**/
+    OVERDUE(12,"逾期"),
+    /**线下开票**/
+    OFFLINE(13,"线下开票"),
+    /**线下执行任务**/
+    OFFLINE_OPERATE(14,"线下执行任务"),
+    /**线下许可人许可**/
+    OFFLINE_LICENSE(15,"线下许可人许可"),
+    /**线下结束**/
+    OFFLINE_END(16,"线下结束")
+    ;
+    @Getter
+    private Integer status;
+    @Getter
+    private String description;
+
+    public static WorkTicketConstants.FirstWorkTicketStatusEnum getEnumByStatus(Integer status) {
+        Optional<WorkTicketConstants.FirstWorkTicketStatusEnum> statusOptional = Arrays.stream(WorkTicketConstants.FirstWorkTicketStatusEnum.class.getEnumConstants())
+                .filter(e-> status.equals(e.getStatus())).findAny();
+        return statusOptional.orElse(null);
+    }
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/mapper/WorkTicketFinishMapper.java

@@ -0,0 +1,17 @@
+package com.hnac.hzims.ticket.twoTicket.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
+
+/**
+ * <p>
+ * 工作结束 Mapper 接口
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-04-24
+ */
+public interface WorkTicketFinishMapper extends BaseMapper<WorkTicketFinish> {
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/mapper/WorkTicketFinishMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.ticket.twoTicket.mapper.WorkTicketFinishMapper">
+
+</mapper>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/IWorkTicketFinishService.java

@@ -0,0 +1,16 @@
+package com.hnac.hzims.ticket.twoTicket.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
+
+/**
+ * <p>
+ * 工作结束 服务类
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-04-24
+ */
+public interface IWorkTicketFinishService extends IService<WorkTicketFinish> {
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.ticket.twoTicket.service;
 
 import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
 
 /**
  * 开票处理流程接口
@@ -13,7 +14,13 @@ public interface TicketProcessService {
 
     /**
      * 启动开票流程
+     */
+    void startUp(WorkTicketVo workTicketVo);
+
+
+    /**
+     * 待处理
      * @param response
      */
-    void startUp(ProcessWorkFlowResponse response);
+    void findPending(ProcessWorkFlowResponse response);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java

@@ -788,6 +788,7 @@ public class FirstWorkTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMa
 		},"messagePush").start();
 	}
 
+
 	/**
 	 * 排除业务中所需属性 避免传入工作流中
 	 * @param variable 工作流传参map

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -1,25 +1,53 @@
 package com.hnac.hzims.ticket.twoTicket.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hnac.hzims.common.logs.utils.StringUtils;
+import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity;
+import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient;
+import com.hnac.hzims.operational.feign.IAccessTaskClient;
+import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceTaskDTO;
+import com.hnac.hzims.operational.maintenance.feign.ITaskClient;
+import com.hnac.hzims.operational.station.entity.StationEntity;
+import com.hnac.hzims.operational.station.feign.IStationClient;
+import com.hnac.hzims.ticket.constants.TicketConstants;
+import com.hnac.hzims.ticket.constants.WorkTicketConstants;
+import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker;
 import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
+import com.hnac.hzims.ticket.twoTicket.enums.FlowWorkTicketConstants;
+import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService;
+import com.hnac.hzims.ticket.twoTicket.service.IWorkTicketFinishService;
 import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
+import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
+import com.hnac.hzims.ticket.workTicket.dto.WorkTicketContentDto;
+import com.hnac.hzims.ticket.workTicket.dto.WorkTicketSafetyMeasureDto;
+import com.hnac.hzims.ticket.workTicket.entity.*;
+import com.hnac.hzims.ticket.workTicket.service.IWorkTicketContentService;
 import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService;
+import com.hnac.hzims.ticket.workTicket.service.IWorkTicketPrincipalChangeService;
+import com.hnac.hzims.ticket.workTicket.service.IWorkTicketSafetyMeasureService;
+import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketDelayServiceImpl;
+import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketOperateTimeServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.apache.bcel.generic.TABLESWITCH;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.flow.core.entity.BladeFlow;
-import org.springblade.flow.core.entity.FlowAttachment;
 import org.springblade.flow.core.feign.IFlowClient;
-import org.springblade.flow.core.vo.ComleteTask;
+import org.springblade.system.user.cache.UserCache;
-import org.springblade.flow.core.vo.TaskList;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
-
+import org.springframework.transaction.annotation.Transactional;
-import javax.crypto.Mac;
+import java.util.*;
-import java.util.ArrayList;
+import java.util.stream.Collectors;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 开票处理流程实现类
@@ -41,115 +69,565 @@ public class TicketProcessServiceImpl implements TicketProcessService {
     private final IWorkTicketInfoService workTicketInfoService;
 
 
-    private Map<String,Boolean> map = new HashMap<String,Boolean>(){{
+    private final ProcessIdWorker processIdWorker;
-        put("key",true);
+
-    }};
+
+    private final IFirstWorkTicketService firstWorkTicketService;
+
+
+    private final IWorkTicketSafetyMeasureService workTicketSafetyMeasureService;
+
+
+    private final IWorkTicketContentService contentService;
+
+
+    private final IUserClient userClient;
+
+
+    private final IOperAccessTaskClient operAccessTaskClient;
+
+
+    private final ITaskClient taskClient;
+
+
+    private final IAccessTaskClient accessTaskClient;
+
+    private String newFirstWorkTicketFlowKey = "workTicket";
+
+
+    private final IStationClient stationClient;
+
+
+    private final WorkTicketOperateTimeServiceImpl workTicketOperateTimeServiceImpl;
+
+
+    private final IWorkTicketFinishService workTicketFinishService;
+
+    private final WorkTicketDelayServiceImpl workTicketDelayService;
+
+
+    private final IWorkTicketPrincipalChangeService workTicketPrincipalChangeService;
+
 
     /**
      * 启动开票流程
      *
+     * @param workTicketVo
+     */
+    @Override
+    @Transactional
+    public void startUp(WorkTicketVo workTicketVo) {
+        if (workTicketVo.getWorkTicket().getSignage() == null) {
+            throw new ServiceException("站点标识-两票编码不能为空");
+        }
+        //1. 获取站点站点标识-两票编码
+        StationEntity stationEntity = new StationEntity();
+        stationEntity.setCode(workTicketVo.getWorkTicket().getSignageCode());
+        R<StationEntity> stationClientOne = stationClient.getOne(stationEntity);
+        if (!stationClientOne.isSuccess()) {
+            throw new IllegalArgumentException("根据条件获取唯一站点出错呢");
+        }
+        StationEntity station = stationClientOne.getData();
+        if (station == null) {
+            throw new ServiceException("根据条件获取唯一站点暂无数据");
+        }
+
+        log.info("前端查的站点编号 :{}",workTicketVo.getWorkTicket().getSignage());
+        log.info("后端查寻的站点编码 :{}",station.getSignage());
+        if (!workTicketVo.getWorkTicket().getSignage().equals(station.getSignage())) {
+            throw new ServiceException("获取唯一站点不一致");
+        }
+        String signage =
+                station.getSignage().length() == 2 ?
+                        station.getSignage() : station.getSignage().substring(0, 2);
+
+        workTicketVo.getWorkTicket().setSignage(signage);
+        workTicketVo.getWorkTicket().setSignageCode(station.getCode());
+        //2. 获取编码
+        String code = processIdWorker.getTicketByCode(workTicketVo.getWorkTicket().getSignage(), workTicketVo.getWorkTicket().getType(), workTicketVo.getWorkTicket().getMakeDateTime());
+        workTicketVo.getWorkTicket().setCode(code);
+        //3 .保存工作对象
+        this.saveWorkTicketInfo(workTicketVo.getWorkTicket());
+        //4. 保存安全措施
+        this.saveSafetyMeasures(workTicketVo.getSafetyMeasuresList(), workTicketVo.getWorkTicket());
+        //5. 保存工作任务
+        this.saveWorkTicketContentDto(workTicketVo.getWorkTicketContentDtoList(), workTicketVo.getWorkTicket());
+        //6. 开启动作流
+        this.dealProcess(newFirstWorkTicketFlowKey, workTicketVo);
+    }
+
+    /**
+     * 待处理
+     *
      * @param response
      */
     @Override
-    public void startUp(ProcessWorkFlowResponse response) {
+    public void findPending(ProcessWorkFlowResponse response) {
+        //json转换表单
+        String formData = response.getVariables();
+        WorkTicketVo workTicketVo = JSON.parseObject(formData, WorkTicketVo.class);
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        //2.流程处理
+        Integer flowStatus = workTicket.getFlowStatus();
+        FlowWorkTicketConstants enumByStatus = FlowWorkTicketConstants.getEnumByStatus(flowStatus);
+        switch (enumByStatus) {
+            // case START:
+            //     //开票
+            //     make(response, workTicketVo);
+            //     break;
+            case SIGN:
+                //签发人签发
+                //工作票签发人默认执行
+                sign(response, workTicketVo);
+                break;
+            case RECEIVE:
+                //运功人接收
+                reception(response, workTicketVo);
+                break;
+            case FIX_UP:
+                // 运行人员布置安全措施
+                safety(response, workTicketVo);
+                break;
+            case PRINCIPAL_CONFIRM_MEASURE:
+                //工作负责人确认安全措施
+                principal(response, workTicketVo);
+                break;
+            case LICENCE:
+                //许可人许可
+                license(response, workTicketVo);
+                break;
+            case PRINCIPAL_CONFIRM_CONTENT:
+                //工作负责人确认工作内容执行
+                principalConfirmContent(response, workTicketVo);
+                break;
+            case PRINCIPAL_CONFIRM_END:
+                //工作负责人确认工作票结束
+                principalConfirmEnd(response, workTicketVo);
+                break;
+            case LICENSE_CONFIRM_END:
+                //许可人确认工作票结束
+                licenseConfirmEnd(response, workTicketVo);
+                break;
+            case PROCESS_POSTPONE:
+                //工作票延期
+                processPostpone(response, workTicketVo);
+                break;
+            case PROCESS_COURSE:
+                //工作票转移
+                processCourse(response,workTicketVo);
+                break;
+            case SIGN_CONFIRM_DELAY:
+                //签发人审核
+                signConfirmDelay(response,workTicketVo);
+                break;
+        }
+    }
+
+
+    /**
+     * 签发人审核
+     * @param response
+     * @param workTicketVo
+     */
+    private void signConfirmDelay(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.LICENCE.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.LICENCE.getDescription());
+        workTicketInfoService.updateById(workTicket);
+
+
+
+    }
+
+
+    /**
+     * 工作票转移
+     * @param response
+     * @param workTicketVo
+     */
+    private void processCourse(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        //工作票负责人变更
+        WorkTicketPrincipalChangeEntity workTicketPrincipalChange = workTicketVo.getWorkTicketPrincipalChange();
+        workTicketPrincipalChangeService.save(workTicketPrincipalChange);
+        //更新工作票信息
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.SIGN_CONFIRM_DELAY.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.SIGN_CONFIRM_DELAY.getDescription());
+        workTicketInfoService.updateById(workTicket);
+
+
+    }
+
+
+    /**
+     * 工作票延期
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void processPostpone(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        //保存工作票延期
+        WorkTicketDelayEntity workTicketDelay = workTicketVo.getWorkTicketDelay();
+        workTicketDelayService.save(workTicketDelay);
+        //更新工作票信息
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.LICENCE.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.LICENCE.getDescription());
+        workTicketInfoService.updateById(workTicket);
+
+    }
+
+
+    /**
+     * 许可人确认工作票结束
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void licenseConfirmEnd(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        //工作结束
+        WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish();
+        workTicketFinishService.updateById(workTicketFinish);
+        //更新工作票信息
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.END.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.END.getDescription());
+        workTicketInfoService.updateById(workTicket);
+    }
+
+
+    /**
+     * 工作负责人确认工作票结束
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void principalConfirmEnd(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        //工作结束
+        WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish();
+        workTicketFinishService.save(workTicketFinish);
+        //更新工作票信息
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.LICENSE_CONFIRM_END.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.LICENSE_CONFIRM_END.getDescription());
+        workTicketInfoService.updateById(workTicket);
+    }
+
+
+    /**
+     * 工作负责人确认工作内容执行
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void principalConfirmContent(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        List<WorkTicketOperateTimeEntity> workTicketOperateTimeEntities = workTicketVo.getWorkTicketOperateTimeEntities();
+        if (CollectionUtils.isEmpty(workTicketOperateTimeEntities)) {
+            log.info("暂时没有每日开工每日收的数据");
+            return;
+        }
+        workTicketOperateTimeServiceImpl.saveBatch(workTicketOperateTimeEntities);
+        //更新工作票信息
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_END.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_END.getDescription());
+        workTicketInfoService.updateById(workTicket);
+    }
+
+    /**
+     * 许可人许可
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void license(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        List<WorkTicketSafetyMeasureDto> safetyMeasuresList = workTicketVo.getSafetyMeasuresList();
+        if (CollectionUtils.isEmpty(safetyMeasuresList)) {
+            log.error("没有安全措施数据");
+            return;
+        }
 
-        Boolean key = map.get("key");
+        //更新安全措施的状态
+        List<WorkTicketSafetyMeasureEntity> workTicketSafetyMeasureEntities = new ArrayList<>();
+        for (WorkTicketSafetyMeasureDto workTicketSafetyMeasureDto : safetyMeasuresList) {
+            WorkTicketSafetyMeasureEntity workTicketSafetyMeasureEntity = BeanUtil.copyProperties(workTicketSafetyMeasureDto, WorkTicketSafetyMeasureEntity.class);
+            workTicketSafetyMeasureEntities.add(workTicketSafetyMeasureEntity);
+        }
+        workTicketSafetyMeasureService.saveBatch(workTicketSafetyMeasureEntities);
 
-        //当前环节Id
+        //更新工作票
-        String processDefinitionKey = response.getProcessDefinitionKey();
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
-        //当前任务Id
+        workTicket.setFlowStatus(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_CONTENT.getStatus());
-        String taskId = response.getTaskId();
+        workTicket.setFlowDescription(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_CONTENT.getDescription());
-        //表单数据
+        workTicketInfoService.updateById(workTicket);
-        String formData = response.getFormData();
+    }
-        log.info("当前任务ID：{}，当前流程定义ID：{}，启动开票流程", taskId, processDefinitionKey);
-        System.out.println(formData);
 
-        // Map<String, Object> variables = new HashMap<>();
+    /**
-        // variables.put("task_id", taskId);
+     * 工作负责人确认安全措施
-        // variables.put("signUserIds", formData);
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void principal(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        //负责人确认时间
+        //workTicket.setConfirmDateTime(workTicketVo.getWorkTicket().getConfirmDateTime());
+
+        workTicket.setFlowStatus(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_MEASURE.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_MEASURE.getDescription());
+        //更新状态值
+        workTicketInfoService.updateById(workTicket);
+    }
 
 
-        if (key) {
+    /**
-            Map<String, Object> params = new HashMap<String, Object>(2) {{
+     * 运行人员布置安全措施
-                put("taskId", "4066d774-df2c-11ed-b33e-fa163ee12c20");
+     *
-                put("signUserIds", "1377143375838359553");
+     * @param response
-            }};
+     * @param workTicketVo
+     */
+    private void safety(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        //值班负责人
+        workTicket.setWatchPrincipal(workTicketVo.getWorkTicket().getPrincipal());
+        workTicket.setWatchPrincipalEndTime(workTicketVo.getWorkTicket().getWatchPrincipalEndTime());
 
 
-            R<BladeFlow> processInstanceContainNameByKey = flowClient.startProcessInstanceContainNameByKey(
+        workTicket.setFlowStatus(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_MEASURE.getStatus());
-                    processDefinitionKey, "workTicket:task:" + 1377143375838359553L,
+        workTicket.setFlowDescription(FlowWorkTicketConstants.PRINCIPAL_CONFIRM_MEASURE.getDescription());
-                    "开启工作的任务",
+        //更新状态值
-                    params);
+        workTicketInfoService.updateById(workTicket);
+    }
+
+
+    /**
+     * 运功人接收
+     *
+     * @param response
+     * @param workTicketVo
+     */
+    private void reception(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setFlowStatus(FlowWorkTicketConstants.FIX_UP.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.FIX_UP.getDescription());
+        //更新状态值
+        workTicketInfoService.updateById(workTicket);
+    }
+
+
+    /**
+     * 第一种工作票签发
+     */
+    //@Transactional(rollbackFor = Exception.class)
+    public void sign(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        //更新状态值
+        WorkTicketInfoEntity workTicketInfoEntity = new WorkTicketInfoEntity();
+        workTicketInfoEntity.setFlowStatus(FlowWorkTicketConstants.RECEIVE.getStatus());
+        workTicketInfoEntity.setFlowDescription(FlowWorkTicketConstants.RECEIVE.getDescription());
+        workTicketInfoEntity.setSignerDateTime(workTicketVo.getWorkTicket().getSignerDateTime());
+        workTicketInfoService.updateById(workTicketInfoEntity);
+    }
+
+
+    /**
+     * 开票
+     */
+    private void make(ProcessWorkFlowResponse response, WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setProcessInstanceId(response.getProcessInstanceId());
+        //保存工作流实例ID
+        workTicketInfoService.update(Wrappers.<WorkTicketInfoEntity>lambdaUpdate().
+                set(WorkTicketInfoEntity::getProcessInstanceId, response.getProcessInstanceId()).
+                set(WorkTicketInfoEntity::getFlowStatus, FlowWorkTicketConstants.SIGN.getStatus()).set(WorkTicketInfoEntity::getFlowDescription, FlowWorkTicketConstants.SIGN.getDescription()).eq(WorkTicketInfoEntity::getId, workTicket.getId()));
+        //处理来源任务
+        this.returnTicket(workTicketVo);
+    }
+
+
+    /**
+     * 处理来源任务
+     *
+     * @param workTicketVo
+     */
+    private void returnTicket(WorkTicketVo workTicketVo) {
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(workTicket.getTaskType())) {
+            OperAccessTaskEntity taskEntity = new OperAccessTaskEntity();
+            taskEntity.setId(workTicket.getTaskId());
+            taskEntity.setTicketId(workTicket.getId());
+            operAccessTaskClient.updateById(taskEntity);
+        }
+        if (TicketConstants.TaskTypeEnum.RCWH.getType().equals(workTicket.getTaskType())) {
+            OperMaintenanceTaskDTO dto = new OperMaintenanceTaskDTO();
+            dto.setId(workTicket.getTaskId());
+            dto.setTicketId(workTicket.getId());
+            taskClient.doUpdateTaskById(dto);
+        }
+        //消缺流程进行
+        if ((TicketConstants.TaskTypeEnum.JXRW.getType().equals(workTicket.getTaskType()) || TicketConstants.TaskTypeEnum.JXJH.getType().equals(workTicket.getTaskType())) && Func.isNotEmpty(workTicket.getTaskId())) {
+            accessTaskClient.billing(workTicket.getTaskId());
+        }
+    }
 
-            if (processInstanceContainNameByKey.getCode() != 200) {
+
-                log.error("启动开票流程失败: {}", processInstanceContainNameByKey);
+    /**
+     * 开启流程
+     *
+     * @param newFirstWorkTicketFlowKey
+     * @param workTicketVo
+     */
+    private void
+    dealProcess(String newFirstWorkTicketFlowKey, WorkTicketVo workTicketVo) {
+        //若为线下工作票 则无需开启工作流
+        Integer status = WorkTicketConstants.FirstWorkTicketStatusEnum.SIGN.getStatus();
+        if (status.intValue() != workTicketVo.getWorkTicket().getStatus().intValue()) {
             return;
         }
+        log.info("租户Id:{}",AuthUtil.getTenantId());
+        log.info("用户部门Id: {}",AuthUtil.getUser().getDeptId());
+        log.info("用户Id: {}",AuthUtil.getUserId());
+        //获取签发人角色下的人员
+        R<List<User>> listR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), Long.parseLong(AuthUtil.getUser().getDeptId()), TicketConstants.SIGNER_ROLE);
+        if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) {
+            throw new ServiceException("工作票签发人角色下未查询到相关人员");
+        }
 
+        log.info("获取签发人角色下的人员: {}",listR.getData());
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("workTicketVo",workTicketVo);
+        R<BladeFlow> processInstanceContainNameByKey = flowClient.startProcessInstanceContainNameByKey(newFirstWorkTicketFlowKey, String.valueOf(workTicketVo.getWorkTicket().getId()), workTicketVo.getWorkTicket().getWorkContent(), params);
+        if (!processInstanceContainNameByKey.isSuccess() && processInstanceContainNameByKey.getData() == null) {
+            throw new ServiceException("启动流程失败...");
+        }
+        //获取BladeFlow 数据库
         BladeFlow bladeFlow = processInstanceContainNameByKey.getData();
-            log.info("bladeFlow: {}", bladeFlow);
+        log.info("获取工作流新的数据： {}",bladeFlow);
-            map.put("key",false);
+        WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket();
+        workTicket.setProcessInstanceId(bladeFlow.getProcessInstanceId());
+        workTicket.setFlowStatus(FlowWorkTicketConstants.SIGN.getStatus());
+        workTicket.setFlowDescription(FlowWorkTicketConstants.SIGN.getDescription());
+        //保存工作流实例ID
+        firstWorkTicketService.updateById(workTicket);
+        workTicketVo.setWorkTicket(workTicket);
+        //处理来源任务
+        this.returnTicket(workTicketVo);
+    }
+
+
+    /**
+     * 保存工作任务
+     *
+     * @param workTicketContentDtoList
+     * @param workTicketInfoEntity
+     */
+    private void saveWorkTicketContentDto(List<WorkTicketContentDto> workTicketContentDtoList, WorkTicketInfoEntity workTicketInfoEntity) {
+        if (CollectionUtils.isEmpty(workTicketContentDtoList)) {
+            return;
+        }
+        List<WorkTicketContentEntity> contentEntities = workTicketContentDtoList.stream().map(contentDto -> {
+            WorkTicketContentEntity contentEntity = BeanUtil.copy(contentDto, WorkTicketContentEntity.class);
+            contentEntity.setTicketId(workTicketInfoEntity.getId());
+            contentEntity.setCreateDept(workTicketInfoEntity.getCreateDept());
+            return contentEntity;
+        }).collect(Collectors.toList());
+        boolean savedBatch = contentService.saveBatch(contentEntities);
+        if (!savedBatch) {
+            throw new IllegalArgumentException("保存工作任务出错呢");
+        }
+
+    }
+
+
+    /**
+     * 保存安全措施
+     *
+     * @param safetyMeasuresList
+     * @param workTicketInfoEntity
+     */
+    private void saveSafetyMeasures(List<WorkTicketSafetyMeasureDto> safetyMeasuresList, WorkTicketInfoEntity workTicketInfoEntity) {
+        if (CollectionUtil.isEmpty(safetyMeasuresList)) {
             return;
         }
+        List<WorkTicketSafetyMeasureEntity> measureEntityList = safetyMeasuresList.stream().map(measure -> {
+            WorkTicketSafetyMeasureEntity measureEntity = BeanUtil.copy(measure, WorkTicketSafetyMeasureEntity.class);
+            measureEntity.setTicketId(workTicketInfoEntity.getId());
+            measureEntity.setCreateDept(workTicketInfoEntity.getCreateDept());
+            measureEntity.setCreateUser(workTicketInfoEntity.getCreateUser());
+            return measureEntity;
+        }).collect(Collectors.toList());
+        boolean savedBatch = workTicketSafetyMeasureService.saveBatch(measureEntityList);
+        if (!savedBatch) {
+            throw new IllegalArgumentException("保存安全措施出错呢");
+        }
+
+    }
 
 
-        // R<BladeFlow> tasks = flowClient.getTaskByProcessInstanceIdAndUserId(response.getProcessInstanceId(),
+    /**
-        //         "1377143375838359553");
+     * 保存工作对象
-        //
+     *
-        //
+     * @param workTicket
-        // flowClient.getTaskByProcessInstanceIdAndUserId(response.getProcessInstanceId(),
+     * @return
-        //         "1377143375838359553");
+     */
-        //
+    private WorkTicketInfoEntity saveWorkTicketInfo(WorkTicketInfoEntity workTicket) {
-        // if (tasks.getCode() != 200){
+        workTicket.setStatus(Func.isEmpty(workTicket.getPrincipal()) || Func.isEmpty(workTicket.getClassGroupMembers()) ? WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus() : WorkTicketConstants.FirstWorkTicketStatusEnum.SIGN.getStatus());
-        //     return;
+        //班组成员名称
-        // }
+        String byclassGroupMembers = getByClassGroupMembers(workTicket);
-        //
+        workTicket.setClassGroupMembersName(byclassGroupMembers);
-        // BladeFlow bladeFlow1 = tasks.getData();
+        //班组负责人
-        //
+        String principalName = getByPrincipal(workTicket);
-        // String curStep = bladeFlow1.getCurStep();
+        workTicket.setPrincipalName(principalName);
-        // System.out.println("curStep = " + curStep);
+        workTicket.setFlowStatus(FlowWorkTicketConstants.START.getStatus());
-        //
+        workTicket.setFlowDescription(FlowWorkTicketConstants.START.getDescription());
-        // String status = bladeFlow1.getStatus();
+        //唯一
-        // System.out.println("status = " + status);
+        workTicket.setCreateUser(AuthUtil.getUserId());
-        //
+        boolean isSave = firstWorkTicketService.save(workTicket);
-        // // R<List<TaskList>> listR = flowClient.todoList(processDefinitionKey);
+        if (!isSave) {
-        // // listR.getData().forEach(taskList -> {
+            throw new IllegalArgumentException("保存工作对象错误");
-        // //     System.out.println("任务名称："+taskList);
+        }
-        // //     System.out.println(taskList.getTaskName());
+        return workTicket;
-        // //     System.out.println(taskList.getStatus());
+    }
-        // // });
+
-        //
+
-        // R<Map<String, Object>> taskedVariables = flowClient.taskVariables(response.getTaskId());
+    /**
-        //
+     * 把班组负责人  ==> principalName 里
-        // System.out.println(taskedVariables);
+     *
-
+     * @param workTicket
-
+     * @return
-        // R<List<TaskList>> listR = flowClient.todoList(response.getProcessDefinitionKey());
+     */
-        // for (TaskList datum : listR.getData()) {
+    private String getByPrincipal(WorkTicketInfoEntity workTicket) {
-        //     System.out.println(datum);
+        //班组成员
-        // }
+        Long principal = workTicket.getPrincipal();
-
+        if (ObjectUtils.isNotEmpty(principal)) {
-
+            return UserCache.getUser(principal).getName();
-        ComleteTask comleteTask = new ComleteTask();
+        }
-        comleteTask.setPass(true);
+        return workTicket.getPrincipalManual();
-        comleteTask.setProcessInstanceId(response.getProcessInstanceId());
+    }
-        comleteTask.setTaksUserId(1377143375838359553L);
-        comleteTask.setTaskId(response.getTaskId());
-        comleteTask.setComment("同意");
-        FlowAttachment flowAttachment= new FlowAttachment();
-        flowAttachment.setProcessInstanceId(response.getProcessInstanceId());
-        flowAttachment.setTaskId(taskId);
-        flowAttachment.setAttachmentType("");
-        List<FlowAttachment>  list  = new ArrayList<>();
-        list.add(flowAttachment);
-        comleteTask.setAttachments(list);
-        Map<String, Object> params = new HashMap<String, Object>(2) {{
-            put("taskId",taskId);
-            put("principalUserIds", "1377143375838359553");
-        }};
-        comleteTask.setVariables(params);
-        flowClient.completeTask(comleteTask);
 
 
+    /**
+     * 把班组成员  ==> classGroupMembersName 里
+     */
+    private String getByClassGroupMembers(WorkTicketInfoEntity workTicket) {
+        StringJoiner stringJoiner = new StringJoiner(",");
+        //班组成员
+        String classGroupMembers = workTicket.getClassGroupMembers();
+        if (StringUtils.isNotBlank(classGroupMembers)) {
+            String[] splits = classGroupMembers.split(",");
+            for (String split : splits) {
+                User user = UserCache.getUser(Long.valueOf(split));
+                stringJoiner.add(user != null ? user.getName() : "");
             }
         }
+        String classGroupMembersManual = workTicket.getClassGroupMembersManual();
+        if (StringUtils.isNotBlank(classGroupMembersManual)) {
+            String[] splits = classGroupMembersManual.split(",");
+            for (String split : splits) {
+                stringJoiner.add(split);
+            }
+        }
+        return stringJoiner.toString();
+    }
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/WorkTicketFinishServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hnac.hzims.ticket.twoTicket.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
+import com.hnac.hzims.ticket.twoTicket.mapper.WorkTicketFinishMapper;
+import com.hnac.hzims.ticket.twoTicket.service.IWorkTicketFinishService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 工作结束 服务实现类
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-04-24
+ */
+@Service
+public class WorkTicketFinishServiceImpl extends ServiceImpl<WorkTicketFinishMapper, WorkTicketFinish> implements IWorkTicketFinishService {
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/SafetyMeasuresVo.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.ticket.twoTicket.vo.process;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -16,32 +17,31 @@ public class SafetyMeasuresVo {
     /**
      * 安全措施Id
      */
+    @ApiModelProperty("安全措施Id")
     private String safetyId;
 
-
     /**
      * 安全措施名称
      */
+    @ApiModelProperty("安全措施名称")
     private String safetyName;
 
     /**
      * 安全措施说明
      */
+    @ApiModelProperty("安全措施说明")
     private String safetyExplain;
 
     /**
      * 是否执行 状态 (true √ false ×)
      */
-    private Boolean status;
+    @ApiModelProperty(" 是否执行 状态 (true √ false ×)")
-
+    private Boolean isExecute;
-    /**
-     * 执行标识 (有的话 已执行 (√)   否 null)
-     */
-    private String statusType;
 
     /**
      * 安全措施时间
      */
+    @ApiModelProperty("安全措施时间")
     private LocalDateTime safetyTime;
 
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/TeamGroupVo.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.ticket.twoTicket.vo.process;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -18,54 +19,96 @@ public class TeamGroupVo {
     /**
      * 班组Id
      */
+    @ApiModelProperty("班组Id")
     private String groupId;
 
 
     /**
      * 班组 名称
      */
+    @ApiModelProperty("班组名称")
     private String groupName;
 
 
     /**
-     * 变更 负责人 id
+     * 负责人id
      */
+    @ApiModelProperty("原负责人id")
     private String workLeaderId;
 
     /**
-     * 变更 负责人 名称
+     * 负责人名称
      */
+    @ApiModelProperty("原负责人名称")
     private String workLeaderName;
 
 
     /**
+     * 负责人id
+     */
+    @ApiModelProperty("原负责人id")
+    private String changeWorkLeaderId;
+
+
+    /**
+     * 变更负责人
+     */
+    private String changeWorkLeaderName;
+
+
+    /**
      * 班组人员
      */
+    @ApiModelProperty("班组人员")
     private List<TeamPersonnelVo> teamGroupName;
 
 
     /**
+     * 开工时间
+     */
+    @ApiModelProperty("开工时间")
+    private LocalDateTime startDateTime;
+
+
+    /**
+     * 收工时间
+     */
+    @ApiModelProperty("收工时间")
+    private LocalDateTime endDateTime;
+
+
+    /**
      * 离开时间
      */
+    @ApiModelProperty("离开时间")
     private LocalDateTime changeGroupDepartureTime;
 
 
     /**
      * 加入时间
      */
+    @ApiModelProperty("加入时间")
     private LocalDateTime changeGroupAddTime;
 
 
     /**
      * 离开内容
      */
+    @ApiModelProperty("离开内容")
     private LocalDateTime changeContent;
 
 
     /**
-     * 收工时间 (完成时间)
+     * 是否有变动
      */
-    private LocalDateTime leaveTime;
+    @ApiModelProperty("是否有变动")
+    private Boolean isChange;
+
 
+    /**
+     * 变动时间
+     */
+    @ApiModelProperty("变动时间")
+    private LocalDateTime changeTime;
 
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/TeamPersonnelVo.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.ticket.twoTicket.vo.process;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -14,22 +15,34 @@ import java.time.LocalDateTime;
 public class TeamPersonnelVo {
 
 
+
     /**
      * 人员名称
      */
-    private  String name;
+    @ApiModelProperty("人员Id")
+    private  String userId;
+
+
+    /**
+     * 人员名称
+     */
+    @ApiModelProperty("人员名称")
+    private  String username;
+
 
 
     /**
-     * 开工时间
+     * 变动人员Id
      */
-    private LocalDateTime startDateTime;
+    @ApiModelProperty("变动人员Id")
+    private  String changeUserId;
 
 
     /**
-     * 收工时间
+     * 变动人员名称
      */
-    private LocalDateTime endDateTime;
+    @ApiModelProperty("变动人员名称")
+    private  String changeUsername;
 
 
 

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/WorkTicketVo.java

@@ -1,162 +1,77 @@
 package com.hnac.hzims.ticket.twoTicket.vo.process;
 
+import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
+import com.hnac.hzims.ticket.workTicket.dto.WorkTicketContentDto;
+import com.hnac.hzims.ticket.workTicket.dto.WorkTicketSafetyMeasureDto;
+import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity;
+import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
+import com.hnac.hzims.ticket.workTicket.entity.WorkTicketOperateTimeEntity;
+import com.hnac.hzims.ticket.workTicket.entity.WorkTicketPrincipalChangeEntity;
+import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketPrincipalChangeServiceImpl;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * @Author WL
+ * @Author dfy
  * @Version v1.0
  * @Serial 1.0
  * @Date 2023/4/6 11:52
  */
 @Data
+@ApiModel("工作票对象")
 public class WorkTicketVo {
 
-    /**
-     * 编号
-     */
-    private String serialNumberId;
-
-
-    /**
-     * 票据名称
-     */
-    private String ticketName;
-
-
-    /**
-     * 票据模板
-     */
-    private String ticketTemplate;
-
-    /**
-     * 开票来源
-     */
-    private String opensource;
-
-    /**
-     * 开票任务来源
-     */
-    private String opensourceTask;
-
-
-    /**
-     * 设备
-     */
-    private String device;
-
-    /**
-     * 单位
-     */
-    private String unit;
-
 
     /**
-     * 班组
+     * 工作票对象
      */
-    private List<TeamGroupVo> TeamGroupList;
+    @ApiModelProperty("工作票对象")
-
+    private WorkTicketInfoEntity workTicket;
-
-    /**
-     * 工作地点
-     */
-    private String workPlace;
-
-
-    /**
-     * 工作内容
-     */
-    private String workContent;
-
-    /**
-     * 设备及工作地点
-     */
-    private String devicePlace;
-
-    /**
-     * 设备及工作内容
-     */
-    private String deviceContent;
-
-
-    /**
-     * 计划开始时间
-     */
-    private LocalDateTime projectStartTime;
-
-    /**
-     * 计划结束时间
-     */
-    private LocalDateTime projectEndTime;
 
 
     /**
      * 安全措施
      */
-    private List<SafetyMeasuresVo> safetyMeasuresList;
+    @ApiModelProperty("安全措施数组")
+    private List<WorkTicketSafetyMeasureDto> safetyMeasuresList;
 
 
     /**
-     * 工作签发人
+     * 工作票工作任务组
      */
-    private String workSigner;
+    @ApiModelProperty("工作票工作任务组")
+    private List<WorkTicketContentDto> workTicketContentDtoList;
 
-    /**
-     * 签发人时间
-     */
-    private LocalDateTime workSignerTime;
 
     /**
-     * 批准工作结束时间
+     * 工作票延期
      */
-    private LocalDateTime workEndTime;
+    @ApiModelProperty("工作票延期")
-
+    private WorkTicketDelayEntity workTicketDelay;
-    /**
-     * 值班负责人
-     */
-    private String WatchPrincipal;
-
-    /**
-     * 许可人
-     */
-    private String licensorName;
-
-    /**
-     * 许可人时间
-     */
-    private LocalDateTime licensorTime;
 
 
     /**
-     * 变动时间
+     * 工作结束
      */
-    private String changeTime;
+    @ApiModelProperty("工作结束")
+    private WorkTicketFinish workTicketFinish;
 
 
     /**
-     * 延期时间
+     * 工作开始时间和结束时间
      */
-    private LocalDateTime postponeDateTime;
+    @ApiModelProperty("工作开始时间和结束时间")
+    private List<WorkTicketOperateTimeEntity> workTicketOperateTimeEntities;
 
 
     /**
-     * 交底内容
+     * 工作票负责人变更
      */
-    private String tellContent;
+    private WorkTicketPrincipalChangeEntity workTicketPrincipalChange;
 
 
-    /**
-     * 工作票结束时间
-     */
-    private LocalDateTime workTicketEndTime;
-
-
-    /**
-     * 备注
-     */
-    private String content;
-
 
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java

@@ -135,4 +135,13 @@ public interface IWorkTicketInfoService extends BaseService<WorkTicketInfoEntity
 	 * @return
 	 */
 	BladePage<StandardWorkVo> workTicketListByMonthAndArea(Page<WorkTicketInfoEntity> pageEntity, StandardTicketWithAreaVo standardTicketWithAreaVo);
+
+
+	/**
+	 * 更新状态值
+	 * @param status
+	 * @param description
+	 * @param id
+	 */
+    void updateFlowStatusById(Integer status, String description, Long id);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +22,7 @@ import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
 import com.hnac.hzims.ticket.aspect.AroundFlow;
 import com.hnac.hzims.ticket.constants.TicketConstants;
+import com.hnac.hzims.ticket.twoTicket.enums.FlowWorkTicketConstants;
 import com.hnac.hzims.ticket.utils.ExcelUtil;
 import com.hnac.hzims.ticket.workTicket.dto.*;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity;
@@ -940,4 +942,20 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         int count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper);
         return count > 0;
     }
+
+
+    /**
+     * 更新状态值
+     *
+     * @param status
+     * @param description
+     * @param id
+     */
+    @Override
+    public void updateFlowStatusById(Integer status, String description, Long id) {
+        LambdaUpdateWrapper<WorkTicketInfoEntity> queryWrapper = new LambdaUpdateWrapper<>();
+        queryWrapper.set(WorkTicketInfoEntity::getFlowStatus, status);
+        queryWrapper.set(WorkTicketInfoEntity::getFlowDescription, description);
+        queryWrapper.eq(WorkTicketInfoEntity::getId,id);
+    }
 }

hzims-service/ticket/src/main/resources/file/工作票.bpmn20.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef" exporter="Flowable Open Source Modeler" exporterVersion="6.7.1">
   <process id="workTicket" name="工作票" isExecutable="true">
     <startEvent id="startEvent1" name="工作负责人开票" flowable:formFieldValidation="true"></startEvent>
     <userTask id="sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A" name="签发人签发" flowable:assignee="${signer}" flowable:formFieldValidation="true">
@@ -11,33 +11,30 @@
     <exclusiveGateway id="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B"></exclusiveGateway>
     <sequenceFlow id="sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" sourceRef="sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A" targetRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B"></sequenceFlow>
     <endEvent id="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8"></endEvent>
-    <sequenceFlow id="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" name="作废" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8"></sequenceFlow>
+    <userTask id="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1" name="运行人员接收" flowable:candidateGroups="${operatorGroup}" flowable:formFieldValidation="true">
-    <userTask id="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1" name="运行人员接收" flowable:assignee="${operator}" flowable:formFieldValidation="true">
       <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+        <flowable:formProperty id="Property 1"></flowable:formProperty>
+        <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>
     <exclusiveGateway id="sid-21B346B8-4672-429C-95D7-FDAC0F364136"></exclusiveGateway>
     <sequenceFlow id="sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" sourceRef="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1" targetRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136"></sequenceFlow>
-    <sequenceFlow id="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" name="作废" sourceRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8"></sequenceFlow>
     <userTask id="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" name="运行人员布置安全措施" flowable:assignee="${operator}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" name="通过" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1"></sequenceFlow>
+    <userTask id="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" name="工作负责人确认安全措施" flowable:assignee="${licensor}" flowable:formFieldValidation="true">
-    <userTask id="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" name="许可人许可" flowable:assignee="${licensor}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-8FA8740A-093B-4756-B489-299A6FFD6C95" sourceRef="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" targetRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22"></sequenceFlow>
-    <userTask id="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" name="工作负责人确认" flowable:assignee="${principal}" flowable:formFieldValidation="true">
+    <userTask id="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" name="工作负责人确认工作内容执行" flowable:assignee="${principal}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="sid-7A556A64-AC9A-4E15-A4CE-959A7C0607AB" sourceRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" targetRef="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA"></sequenceFlow>
     <exclusiveGateway id="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA"></exclusiveGateway>
     <userTask id="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C" name="工作负责人确认工作票结束、终结" flowable:assignee="${principal}" flowable:formFieldValidation="true">
       <extensionElements>
@@ -50,7 +47,7 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-7CA973D4-40DF-49AB-9822-959508274656" sourceRef="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C" targetRef="sid-72E8C993-D426-476F-BF7F-F7EC3B783022"></sequenceFlow>
-    <endEvent id="sid-F5C6B054-72BA-4531-BF1E-BF9757B2AFDD"></endEvent>
+    <endEvent id="sid-F5C6B054-72BA-4531-BF1E-BF9757B2AFDD" name="结束"></endEvent>
     <sequenceFlow id="sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" sourceRef="sid-72E8C993-D426-476F-BF7F-F7EC3B783022" targetRef="sid-F5C6B054-72BA-4531-BF1E-BF9757B2AFDD"></sequenceFlow>
     <sequenceFlow id="sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" sourceRef="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" targetRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA"></sequenceFlow>
     <userTask id="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" name="签发人审核" flowable:assignee="${signer}" flowable:formFieldValidation="true">
@@ -58,20 +55,35 @@
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="sid-73A0093F-8422-4364-AAA7-50F52FBF091A" sourceRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" targetRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22"></sequenceFlow>
+    <userTask id="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" name="许可人许可" flowable:assignee="${licensor}" flowable:formFieldValidation="true">
-    <sequenceFlow id="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" name="通过" sourceRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136" targetRef="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708"></sequenceFlow>
+      <extensionElements>
-    <sequenceFlow id="sid-1A20A49D-E9EF-4FAF-AFF1-6E22FD196407" name="添加工作内容" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22">
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==addContent}]]></conditionExpression>
+      </extensionElements>
-    </sequenceFlow>
+    </userTask>
-    <sequenceFlow id="sid-37995FE3-97E1-4027-8DA5-8CDCB71392EE" name="未通过" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708">
+    <sequenceFlow id="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" name="工作票转移" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==false}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==delay}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" name="通过" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C">
+    <sequenceFlow id="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" name="通过间断" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==true}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" name="工作票间断、转移、延期" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418">
+    <sequenceFlow id="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" name="通过" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==delay}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${signFlag==true}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" name="作废" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${signFlag==false}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" name="作废" sourceRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${recieveFlag==false}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" name="通过" sourceRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136" targetRef="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${recieveFlag==true}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-6358A80D-F592-4875-B281-A5B14A0EA39E" name="工作票延期" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${delay==true}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" sourceRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5"></sequenceFlow>
+    <sequenceFlow id="sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" sourceRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" targetRef="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA"></sequenceFlow>
+    <sequenceFlow id="sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" sourceRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_workTicket">
     <bpmndi:BPMNPlane bpmnElement="workTicket" id="BPMNPlane_workTicket">
@@ -94,19 +106,19 @@
         <omgdc:Bounds height="40.0" width="40.0" x="640.0" y="158.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" id="BPMNShape_sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708">
-        <omgdc:Bounds height="80.0" width="100.0" x="725.0" y="138.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="795.0" y="135.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" id="BPMNShape_sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22">
-        <omgdc:Bounds height="80.0" width="100.0" x="885.0" y="138.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="960.0" y="138.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" id="BPMNShape_sid-5476EB52-438F-4C74-94FB-88A6EA6625EA">
-        <omgdc:Bounds height="80.0" width="100.0" x="885.0" y="270.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="794.9999763071544" y="269.9999919533732"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" id="BPMNShape_sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA">
-        <omgdc:Bounds height="40.0" width="40.0" x="755.0" y="290.0"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="660.0" y="290.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C" id="BPMNShape_sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C">
-        <omgdc:Bounds height="80.0" width="100.0" x="510.0" y="270.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="450.0" y="270.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-72E8C993-D426-476F-BF7F-F7EC3B783022" id="BPMNShape_sid-72E8C993-D426-476F-BF7F-F7EC3B783022">
         <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="270.0"></omgdc:Bounds>
@@ -115,79 +127,87 @@
         <omgdc:Bounds height="28.0" width="28.0" x="101.0" y="296.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" id="BPMNShape_sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418">
-        <omgdc:Bounds height="80.0" width="100.0" x="885.0" y="378.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="795.0" y="378.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-1A20A49D-E9EF-4FAF-AFF1-6E22FD196407" id="BPMNEdge_sid-1A20A49D-E9EF-4FAF-AFF1-6E22FD196407">
+      <bpmndi:BPMNShape bpmnElement="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" id="BPMNShape_sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5">
-        <omgdi:waypoint x="786.397345890411" y="301.4246575342466"></omgdi:waypoint>
+        <omgdc:Bounds height="80.0" width="100.0" x="960.0" y="270.0"></omgdc:Bounds>
-        <omgdi:waypoint x="886.8490566037735" y="217.95000000000002"></omgdi:waypoint>
+      </bpmndi:BPMNShape>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" id="BPMNEdge_sid-C0864800-3575-4EA5-BDB2-53CB0064185D" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-37995FE3-97E1-4027-8DA5-8CDCB71392EE" id="BPMNEdge_sid-37995FE3-97E1-4027-8DA5-8CDCB71392EE">
+        <omgdi:waypoint x="660.0" y="310.0"></omgdi:waypoint>
-        <omgdi:waypoint x="775.4242424242424" y="290.42424242424244"></omgdi:waypoint>
+        <omgdi:waypoint x="549.9499999998765" y="310.0"></omgdi:waypoint>
-        <omgdi:waypoint x="775.1507547169812" y="217.95000000000002"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" id="BPMNEdge_sid-C0864800-3575-4EA5-BDB2-53CB0064185D">
-        <omgdi:waypoint x="755.453488372093" y="310.45348837209303"></omgdi:waypoint>
-        <omgdi:waypoint x="609.949999999987" y="310.1158932714617"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" id="BPMNEdge_sid-9DC6746E-6FCC-4006-B68A-98F280A5263D">
+      <bpmndi:BPMNEdge bpmnElement="sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" id="BPMNEdge_sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
-        <omgdi:waypoint x="884.9999999999972" y="310.1565830721003"></omgdi:waypoint>
+        <omgdi:waypoint x="794.9999761399811" y="309.9999943893069"></omgdi:waypoint>
-        <omgdi:waypoint x="794.465245437382" y="310.440251572327"></omgdi:waypoint>
+        <omgdi:waypoint x="699.9060197690516" y="309.9999990246512"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" id="BPMNEdge_sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD">
+      <bpmndi:BPMNEdge bpmnElement="sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" id="BPMNEdge_sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
         <omgdi:waypoint x="269.9999999999384" y="310.0"></omgdi:waypoint>
         <omgdi:waypoint x="128.9499230927493" y="310.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-9139C410-EEF1-426B-80DE-CE61E405D476" id="BPMNEdge_sid-9139C410-EEF1-426B-80DE-CE61E405D476">
+      <bpmndi:BPMNEdge bpmnElement="sid-9139C410-EEF1-426B-80DE-CE61E405D476" id="BPMNEdge_sid-9139C410-EEF1-426B-80DE-CE61E405D476" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="129.94999928606217" y="178.0"></omgdi:waypoint>
         <omgdi:waypoint x="224.99999999995185" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" id="BPMNEdge_sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914">
+      <bpmndi:BPMNEdge bpmnElement="sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" id="BPMNEdge_sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="660.5" y="158.5"></omgdi:waypoint>
+        <omgdi:waypoint x="894.9499999998898" y="418.0"></omgdi:waypoint>
-        <omgdi:waypoint x="660.5" y="74.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="418.0"></omgdi:waypoint>
-        <omgdi:waypoint x="423.94992119126084" y="74.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="349.95000000000005"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
+      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" id="BPMNEdge_sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7">
+      <bpmndi:BPMNEdge bpmnElement="sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" id="BPMNEdge_sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="679.5247370727428" y="178.41666666666663"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="217.95000000000002"></omgdi:waypoint>
-        <omgdi:waypoint x="724.9999999999953" y="178.21812227074233"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="270.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
+      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" id="BPMNEdge_sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC">
+      <bpmndi:BPMNEdge bpmnElement="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" id="BPMNEdge_sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
-        <omgdi:waypoint x="324.9499999999993" y="178.18431734317343"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="158.0"></omgdi:waypoint>
-        <omgdi:waypoint x="390.42592592592536" y="178.42592592592592"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="74.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
+        <omgdi:waypoint x="423.9499212085268" y="74.0"></omgdi:waypoint>
-      <bpmndi:BPMNEdge bpmnElement="sid-7CA973D4-40DF-49AB-9822-959508274656" id="BPMNEdge_sid-7CA973D4-40DF-49AB-9822-959508274656">
+      </bpmndi:BPMNEdge>
-        <omgdi:waypoint x="510.0" y="310.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" id="BPMNEdge_sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="369.94999999992524" y="310.0"></omgdi:waypoint>
+        <omgdi:waypoint x="679.9371456185567" y="178.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
+        <omgdi:waypoint x="737.5" y="178.0"></omgdi:waypoint>
-      <bpmndi:BPMNEdge bpmnElement="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" id="BPMNEdge_sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46">
+        <omgdi:waypoint x="737.5" y="175.0"></omgdi:waypoint>
-        <omgdi:waypoint x="410.40384615384613" y="158.40384615384616"></omgdi:waypoint>
+        <omgdi:waypoint x="795.0" y="175.0"></omgdi:waypoint>
-        <omgdi:waypoint x="410.0667456225906" y="87.94957625753017"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" id="BPMNEdge_sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" id="BPMNEdge_sid-3970686C-5839-4ABA-8FEB-B68941C36CC2">
+        <omgdi:waypoint x="324.95000000000005" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="594.9499999999977" y="178.21623376623376"></omgdi:waypoint>
+        <omgdi:waypoint x="390.0" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="640.4130434782554" y="178.41304347826085"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7CA973D4-40DF-49AB-9822-959508274656" id="BPMNEdge_sid-7CA973D4-40DF-49AB-9822-959508274656" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-8FA8740A-093B-4756-B489-299A6FFD6C95" id="BPMNEdge_sid-8FA8740A-093B-4756-B489-299A6FFD6C95">
+        <omgdi:waypoint x="450.0" y="310.0"></omgdi:waypoint>
-        <omgdi:waypoint x="824.9499999999329" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="369.94999999987647" y="310.0"></omgdi:waypoint>
-        <omgdi:waypoint x="884.9999999998608" y="178.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" id="BPMNEdge_sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-7A556A64-AC9A-4E15-A4CE-959A7C0607AB" id="BPMNEdge_sid-7A556A64-AC9A-4E15-A4CE-959A7C0607AB">
+        <omgdi:waypoint x="960.0" y="309.9999975616286"></omgdi:waypoint>
-        <omgdi:waypoint x="935.0" y="217.95000000000002"></omgdi:waypoint>
+        <omgdi:waypoint x="894.9499760112941" y="309.9999943893062"></omgdi:waypoint>
-        <omgdi:waypoint x="935.0" y="270.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" id="BPMNEdge_sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" id="BPMNEdge_sid-68BB74A5-8B6B-41CE-A158-66C6E9233012">
+        <omgdi:waypoint x="410.0" y="158.0"></omgdi:waypoint>
-        <omgdi:waypoint x="429.51359060401785" y="178.42910447761193"></omgdi:waypoint>
+        <omgdi:waypoint x="410.0" y="87.94993418278018"></omgdi:waypoint>
-        <omgdi:waypoint x="494.9999999999888" y="178.185687732342"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-6358A80D-F592-4875-B281-A5B14A0EA39E" id="BPMNEdge_sid-6358A80D-F592-4875-B281-A5B14A0EA39E" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-73A0093F-8422-4364-AAA7-50F52FBF091A" id="BPMNEdge_sid-73A0093F-8422-4364-AAA7-50F52FBF091A">
+        <omgdi:waypoint x="680.0" y="290.0"></omgdi:waypoint>
-        <omgdi:waypoint x="984.9499999999756" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="680.0" y="243.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1030.5" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="243.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1030.5" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="270.0"></omgdi:waypoint>
-        <omgdi:waypoint x="984.9499999999538" y="178.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" id="BPMNEdge_sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
-      <bpmndi:BPMNEdge bpmnElement="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" id="BPMNEdge_sid-FB7BF0B3-5189-437F-B29D-B87E22A81460">
+        <omgdi:waypoint x="594.9499999999468" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="775.5" y="329.44119423791824"></omgdi:waypoint>
+        <omgdi:waypoint x="640.0" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="775.5" y="418.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
-        <omgdi:waypoint x="884.9999999999267" y="418.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-8FA8740A-093B-4756-B489-299A6FFD6C95" id="BPMNEdge_sid-8FA8740A-093B-4756-B489-299A6FFD6C95" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="894.9499999999999" y="175.0"></omgdi:waypoint>
+        <omgdi:waypoint x="927.5" y="175.0"></omgdi:waypoint>
+        <omgdi:waypoint x="927.5" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="959.9999999999852" y="178.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" id="BPMNEdge_sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="429.9426165803081" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="495.0" y="178.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" id="BPMNEdge_sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="680.0" y="329.9407724329325"></omgdi:waypoint>
+        <omgdi:waypoint x="680.0" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="795.0" y="418.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

hzims-service/ticket/src/main/resources/file/新工作票.bpmn20.xml

@@ -1,88 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef" exporter="Flowable Open Source Modeler" exporterVersion="6.7.1">
-  <process id="workTicket" name="工作票" isExecutable="true">
+  <process id="workTicket" name="新工作票" isExecutable="true">
     <startEvent id="startEvent1" name="工作负责人开票" flowable:formFieldValidation="true"></startEvent>
-    <userTask id="sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A" name="签发人签发" flowable:assignee="${signer}" flowable:formFieldValidation="true">
+    <userTask id="sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A" name="签发人签发" flowable:candidateGroups="${signer}" flowable:formFieldValidation="true">
       <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+        <flowable:executionListener event="start" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:executionListener>
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-9139C410-EEF1-426B-80DE-CE61E405D476" sourceRef="startEvent1" targetRef="sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A"></sequenceFlow>
     <exclusiveGateway id="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B"></exclusiveGateway>
     <sequenceFlow id="sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" sourceRef="sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A" targetRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B"></sequenceFlow>
     <endEvent id="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8"></endEvent>
-    <userTask id="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1" name="运行人员接收" flowable:assignee="${operator}" flowable:formFieldValidation="true">
+    <userTask id="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1" name="运行人员接收" flowable:candidateGroups="${operatingCrew}" flowable:formFieldValidation="true">
       <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+        <flowable:executionListener event="start" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:executionListener>
+        <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
       </extensionElements>
     </userTask>
     <exclusiveGateway id="sid-21B346B8-4672-429C-95D7-FDAC0F364136"></exclusiveGateway>
     <sequenceFlow id="sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" sourceRef="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1" targetRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136"></sequenceFlow>
-    <userTask id="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" name="运行人员布置安全措施" flowable:assignee="${operator}" flowable:formFieldValidation="true">
+    <userTask id="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" name="布置安全措施" flowable:assignee="${operator}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <userTask id="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" name="工作负责人确认安全措施" flowable:assignee="${licensor}" flowable:formFieldValidation="true">
+    <userTask id="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" name="确认安全措施" flowable:assignee="${principal}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-8FA8740A-093B-4756-B489-299A6FFD6C95" sourceRef="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" targetRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22"></sequenceFlow>
-    <userTask id="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" name="工作负责人确认工作内容执行" flowable:assignee="${principal}" flowable:formFieldValidation="true">
+    <userTask id="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" name="确认工作内容执行" flowable:assignee="${principal}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
     <exclusiveGateway id="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA"></exclusiveGateway>
-    <userTask id="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C" name="工作负责人确认工作票结束、终结" flowable:assignee="${principal}" flowable:formFieldValidation="true">
+    <userTask id="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C" name="工作负责人确认结束" flowable:assignee="${principal}" flowable:formFieldValidation="true">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <userTask id="sid-72E8C993-D426-476F-BF7F-F7EC3B783022" name="许可人确认工作票结束、终结" flowable:assignee="${licensor}" flowable:formFieldValidation="true">
+    <userTask id="sid-72E8C993-D426-476F-BF7F-F7EC3B783022" name="许可人确认结束" flowable:candidateGroups="${licensor}" flowable:formFieldValidation="true">
       <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+        <flowable:executionListener event="start" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:executionListener>
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-7CA973D4-40DF-49AB-9822-959508274656" sourceRef="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C" targetRef="sid-72E8C993-D426-476F-BF7F-F7EC3B783022"></sequenceFlow>
     <endEvent id="sid-F5C6B054-72BA-4531-BF1E-BF9757B2AFDD" name="结束"></endEvent>
     <sequenceFlow id="sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" sourceRef="sid-72E8C993-D426-476F-BF7F-F7EC3B783022" targetRef="sid-F5C6B054-72BA-4531-BF1E-BF9757B2AFDD"></sequenceFlow>
     <sequenceFlow id="sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" sourceRef="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" targetRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA"></sequenceFlow>
-    <userTask id="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" name="签发人审核" flowable:assignee="${signer}" flowable:formFieldValidation="true">
+    <userTask id="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" name="签发人审核" flowable:candidateGroups="${signer}" flowable:formFieldValidation="true">
       <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+        <flowable:executionListener event="start" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:executionListener>
       </extensionElements>
     </userTask>
-    <userTask id="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" name="许可人许可" flowable:assignee="${licensor}" flowable:formFieldValidation="true">
+    <userTask id="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" name="许可人许可" flowable:candidateGroups="${licensor}" flowable:formFieldValidation="true">
       <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+        <flowable:executionListener event="start" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:executionListener>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" name="工作票转移" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==delay}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" name="通过间断" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==true}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" name="通过" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${signFlag==true}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" name="作废" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${signFlag==false}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" name="作废" sourceRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${recieveFlag==false}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" name="通过" sourceRef="sid-21B346B8-4672-429C-95D7-FDAC0F364136" targetRef="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${recieveFlag==true}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-6358A80D-F592-4875-B281-A5B14A0EA39E" name="工作票延期" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${delay==true}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" sourceRef="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5"></sequenceFlow>
     <sequenceFlow id="sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" sourceRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" targetRef="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA"></sequenceFlow>
     <sequenceFlow id="sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" sourceRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5"></sequenceFlow>
+    <sequenceFlow id="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" name="作废" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-F6E6B8A6-D73D-4DF5-99A1-609660DCC4F8">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${signFlag==false}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" name="通过" sourceRef="sid-AE1F1B34-40E2-49A0-AF63-D7F46152C68B" targetRef="sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${signFlag==true}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" name="通过间断" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==true}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" name="工作票转移" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${flag==delay}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-3BAE05DE-BF27-49CE-BA94-F50A6671DC66" sourceRef="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" targetRef="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_workTicket">
     <bpmndi:BPMNPlane bpmnElement="workTicket" id="BPMNPlane_workTicket">
@@ -105,13 +104,13 @@
         <omgdc:Bounds height="40.0" width="40.0" x="640.0" y="158.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708" id="BPMNShape_sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708">
-        <omgdc:Bounds height="80.0" width="100.0" x="795.0" y="138.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="794.9999763071544" y="138.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22" id="BPMNShape_sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22">
         <omgdc:Bounds height="80.0" width="100.0" x="960.0" y="138.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-5476EB52-438F-4C74-94FB-88A6EA6625EA" id="BPMNShape_sid-5476EB52-438F-4C74-94FB-88A6EA6625EA">
-        <omgdc:Bounds height="80.0" width="100.0" x="794.9999763071544" y="269.9999919533732"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="795.0" y="270.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA" id="BPMNShape_sid-FBFCD5F6-FD6E-46C7-882C-EB53C8ADD2EA">
         <omgdc:Bounds height="40.0" width="40.0" x="660.0" y="290.0"></omgdc:Bounds>
@@ -126,83 +125,83 @@
         <omgdc:Bounds height="28.0" width="28.0" x="101.0" y="296.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418" id="BPMNShape_sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418">
-        <omgdc:Bounds height="80.0" width="100.0" x="795.0" y="378.0"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="795.0" y="375.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5" id="BPMNShape_sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5">
         <omgdc:Bounds height="80.0" width="100.0" x="960.0" y="270.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" id="BPMNEdge_sid-C0864800-3575-4EA5-BDB2-53CB0064185D">
+      <bpmndi:BPMNEdge bpmnElement="sid-C0864800-3575-4EA5-BDB2-53CB0064185D" id="BPMNEdge_sid-C0864800-3575-4EA5-BDB2-53CB0064185D" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="660.4444444444445" y="310.44444444444446"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="310.0"></omgdi:waypoint>
-        <omgdi:waypoint x="549.95" y="310.13836565096955"></omgdi:waypoint>
+        <omgdi:waypoint x="549.9499999998765" y="310.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" id="BPMNEdge_sid-9DC6746E-6FCC-4006-B68A-98F280A5263D">
+      <bpmndi:BPMNEdge bpmnElement="sid-3BAE05DE-BF27-49CE-BA94-F50A6671DC66" id="BPMNEdge_sid-3BAE05DE-BF27-49CE-BA94-F50A6671DC66" flowable:sourceDockerX="20.5" flowable:sourceDockerY="20.5" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="794.9999763071544" y="310.1518181267848"></omgdi:waypoint>
+        <omgdi:waypoint x="680.5" y="290.5"></omgdi:waypoint>
-        <omgdi:waypoint x="699.4632559712379" y="310.4420722272896"></omgdi:waypoint>
+        <omgdi:waypoint x="680.5" y="241.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="241.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="270.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" id="BPMNEdge_sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD">
+      <bpmndi:BPMNEdge bpmnElement="sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" id="BPMNEdge_sid-9DC6746E-6FCC-4006-B68A-98F280A5263D" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
+        <omgdi:waypoint x="795.0" y="310.0"></omgdi:waypoint>
+        <omgdi:waypoint x="699.9060187992723" y="310.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" id="BPMNEdge_sid-44567028-AC19-441E-ACB1-A3CFAADF1DDD" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
         <omgdi:waypoint x="269.9999999999384" y="310.0"></omgdi:waypoint>
         <omgdi:waypoint x="128.9499230927493" y="310.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-9139C410-EEF1-426B-80DE-CE61E405D476" id="BPMNEdge_sid-9139C410-EEF1-426B-80DE-CE61E405D476">
+      <bpmndi:BPMNEdge bpmnElement="sid-9139C410-EEF1-426B-80DE-CE61E405D476" id="BPMNEdge_sid-9139C410-EEF1-426B-80DE-CE61E405D476" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="129.94999928606217" y="178.0"></omgdi:waypoint>
         <omgdi:waypoint x="224.99999999995185" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" id="BPMNEdge_sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530">
+      <bpmndi:BPMNEdge bpmnElement="sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" id="BPMNEdge_sid-3299B7B1-1FB5-4F4B-A440-A6DE86D93530" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="894.9499999998898" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="894.9499999998898" y="415.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1010.0" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1010.0" y="415.0"></omgdi:waypoint>
         <omgdi:waypoint x="1010.0" y="349.95000000000005"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" id="BPMNEdge_sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06">
+      <bpmndi:BPMNEdge bpmnElement="sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" id="BPMNEdge_sid-03099AE3-D7AD-40EB-9D5E-F148124C2B06" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="1010.0" y="217.95000000000002"></omgdi:waypoint>
         <omgdi:waypoint x="1010.0" y="270.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" id="BPMNEdge_sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914">
+      <bpmndi:BPMNEdge bpmnElement="sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" id="BPMNEdge_sid-01DEF90D-6E6D-4E1C-9DB2-BCF57F997914" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
-        <omgdi:waypoint x="660.5" y="158.5"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="158.0"></omgdi:waypoint>
-        <omgdi:waypoint x="660.5" y="74.0"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="74.0"></omgdi:waypoint>
-        <omgdi:waypoint x="423.94992119126084" y="74.0"></omgdi:waypoint>
+        <omgdi:waypoint x="423.9499212085268" y="74.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" id="BPMNEdge_sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7">
+      <bpmndi:BPMNEdge bpmnElement="sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" id="BPMNEdge_sid-2551F3F7-0B18-46ED-A0FA-F1521C3F44E7" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="679.4963199348169" y="178.4483695652174"></omgdi:waypoint>
+        <omgdi:waypoint x="679.9446110203799" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="794.9999999999956" y="178.13536585365856"></omgdi:waypoint>
+        <omgdi:waypoint x="794.9999763071544" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" id="BPMNEdge_sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC">
+      <bpmndi:BPMNEdge bpmnElement="sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" id="BPMNEdge_sid-4B0EAA53-D3FE-4EF0-97D2-9F849E47C2DC" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
-        <omgdi:waypoint x="324.9499999999993" y="178.18431734317343"></omgdi:waypoint>
+        <omgdi:waypoint x="324.95000000000005" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="390.42592592592536" y="178.42592592592592"></omgdi:waypoint>
+        <omgdi:waypoint x="390.0" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-7CA973D4-40DF-49AB-9822-959508274656" id="BPMNEdge_sid-7CA973D4-40DF-49AB-9822-959508274656">
+      <bpmndi:BPMNEdge bpmnElement="sid-7CA973D4-40DF-49AB-9822-959508274656" id="BPMNEdge_sid-7CA973D4-40DF-49AB-9822-959508274656" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="450.0" y="310.0"></omgdi:waypoint>
         <omgdi:waypoint x="369.94999999987647" y="310.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" id="BPMNEdge_sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6">
+      <bpmndi:BPMNEdge bpmnElement="sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" id="BPMNEdge_sid-58A4E292-9777-4D8D-8494-0ABFA1BFD3A6" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="960.0" y="309.9999975616286"></omgdi:waypoint>
+        <omgdi:waypoint x="960.0" y="310.0"></omgdi:waypoint>
-        <omgdi:waypoint x="894.9499760112941" y="309.9999943893062"></omgdi:waypoint>
+        <omgdi:waypoint x="894.9499999999939" y="310.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" id="BPMNEdge_sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46">
-        <omgdi:waypoint x="410.40384615384613" y="158.40384615384616"></omgdi:waypoint>
-        <omgdi:waypoint x="410.0667456225906" y="87.94957625753017"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-6358A80D-F592-4875-B281-A5B14A0EA39E" id="BPMNEdge_sid-6358A80D-F592-4875-B281-A5B14A0EA39E">
+      <bpmndi:BPMNEdge bpmnElement="sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" id="BPMNEdge_sid-4219D0D3-DDBC-49E1-B40C-1B54C33B5B46" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
-        <omgdi:waypoint x="680.5" y="290.5"></omgdi:waypoint>
+        <omgdi:waypoint x="410.0" y="158.0"></omgdi:waypoint>
-        <omgdi:waypoint x="680.5" y="243.90908813476562"></omgdi:waypoint>
+        <omgdi:waypoint x="410.0" y="87.94993418278018"></omgdi:waypoint>
-        <omgdi:waypoint x="1010.0" y="243.90908813476562"></omgdi:waypoint>
-        <omgdi:waypoint x="1010.0" y="270.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" id="BPMNEdge_sid-3970686C-5839-4ABA-8FEB-B68941C36CC2">
+      <bpmndi:BPMNEdge bpmnElement="sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" id="BPMNEdge_sid-3970686C-5839-4ABA-8FEB-B68941C36CC2" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
-        <omgdi:waypoint x="594.9499999999977" y="178.21623376623376"></omgdi:waypoint>
+        <omgdi:waypoint x="594.9499999999468" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="640.4130434782554" y="178.41304347826085"></omgdi:waypoint>
+        <omgdi:waypoint x="640.0" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-8FA8740A-093B-4756-B489-299A6FFD6C95" id="BPMNEdge_sid-8FA8740A-093B-4756-B489-299A6FFD6C95">
+      <bpmndi:BPMNEdge bpmnElement="sid-8FA8740A-093B-4756-B489-299A6FFD6C95" id="BPMNEdge_sid-8FA8740A-093B-4756-B489-299A6FFD6C95" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="894.9499999998898" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="894.9499763070487" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="959.9999999999847" y="178.0"></omgdi:waypoint>
+        <omgdi:waypoint x="959.9999999999795" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" id="BPMNEdge_sid-68BB74A5-8B6B-41CE-A158-66C6E9233012">
+      <bpmndi:BPMNEdge bpmnElement="sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" id="BPMNEdge_sid-68BB74A5-8B6B-41CE-A158-66C6E9233012" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="429.51359060401785" y="178.42910447761193"></omgdi:waypoint>
+        <omgdi:waypoint x="429.9426165803081" y="178.0"></omgdi:waypoint>
-        <omgdi:waypoint x="494.9999999999888" y="178.185687732342"></omgdi:waypoint>
+        <omgdi:waypoint x="495.0" y="178.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" id="BPMNEdge_sid-FB7BF0B3-5189-437F-B29D-B87E22A81460">
+      <bpmndi:BPMNEdge bpmnElement="sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" id="BPMNEdge_sid-FB7BF0B3-5189-437F-B29D-B87E22A81460" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="680.5" y="329.44119423791824"></omgdi:waypoint>
+        <omgdi:waypoint x="680.0" y="329.9405090390105"></omgdi:waypoint>
-        <omgdi:waypoint x="680.5" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="680.0" y="415.0"></omgdi:waypoint>
-        <omgdi:waypoint x="794.9999999998903" y="418.0"></omgdi:waypoint>
+        <omgdi:waypoint x="795.0" y="415.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/TicketApplicationTest.java

@@ -84,4 +84,11 @@ public class TicketApplicationTest {
 		TicketInfoStatisticVO ticketInfoStatisticVO = firstWorkTicketService.workTicketReportStatistic(startDate, endDate, deptIdList);
 		log.info("{}",JSON.toJSONString(ticketInfoStatisticVO));
 	}
+
+
+	@Test
+	public void worker() {
+		System.out.println(1);
+	}
+
 }