新增项目变更计划查询列表

sop-business/src/main/java/com/qmth/sop/business/mapper/TBProjectExchangeMapper.java

@@ -1,7 +1,11 @@
 package com.qmth.sop.business.mapper;
 
-import com.qmth.sop.business.entity.TBProjectExchange;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.sop.business.entity.TBProjectExchange;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TBProjectExchangeMapper extends BaseMapper<TBProjectExchange> {
 
+    /**
+     * 项目变更计划申请列表
+     *
+     * @param iPage
+     * @param serviceId
+     * @param createUserId
+     * @param type
+     * @param customType
+     * @param flowStatus
+     * @param customName
+     * @param exchangeNo
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    IPage<Map> list(IPage<Map> iPage, @Param("serviceId") Long serviceId, @Param("createUserId") Long createUserId, @Param("type") String type, @Param("customType") String customType, @Param("flowStatus") String flowStatus, @Param("customName") String customName, @Param("exchangeNo") String exchangeNo, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBProjectExchangeService.java

@@ -1,7 +1,13 @@
 package com.qmth.sop.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.entity.TBProjectExchange;
+import com.qmth.sop.common.enums.DelayWarnTypeEnum;
+import com.qmth.sop.common.enums.ProductTypeEnum;
+import com.qmth.sop.common.enums.ProjectExchangeFlowStatusEnum;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +27,21 @@ public interface TBProjectExchangeService extends IService<TBProjectExchange> {
      * @throws InterruptedException
      */
     Boolean saveProjectExchange(TBProjectExchange tbProjectExchange) throws InterruptedException;
+
+    /**
+     * 项目变更计划申请列表
+     *
+     * @param iPage
+     * @param serviceId
+     * @param createUserId
+     * @param type
+     * @param customType
+     * @param flowStatus
+     * @param customName
+     * @param exchangeNo
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    IPage<Map> list(IPage<Map> iPage, Long serviceId, Long createUserId, DelayWarnTypeEnum type, ProductTypeEnum customType, ProjectExchangeFlowStatusEnum flowStatus, String customName, String exchangeNo, Long startTime, Long endTime);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBProjectExchangeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.bean.params.FlowApproveParam;
@@ -10,7 +11,10 @@ import com.qmth.sop.business.mapper.TBProjectExchangeMapper;
 import com.qmth.sop.business.service.TBProjectExchangeService;
 import com.qmth.sop.business.service.TFCustomFlowEntityService;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.DelayWarnTypeEnum;
 import com.qmth.sop.common.enums.FlowApprovePassEnum;
+import com.qmth.sop.common.enums.ProductTypeEnum;
+import com.qmth.sop.common.enums.ProjectExchangeFlowStatusEnum;
 import com.qmth.sop.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +23,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -55,4 +60,26 @@ public class TBProjectExchangeServiceImpl extends ServiceImpl<TBProjectExchangeM
         tfCustomFlowEntityService.updateById(tfCustomFlowEntity);
         return this.saveOrUpdate(tbProjectExchange);
     }
+
+    /**
+     * 项目变更计划申请列表
+     *
+     * @param iPage
+     * @param serviceId
+     * @param createUserId
+     * @param type
+     * @param customType
+     * @param flowStatus
+     * @param customName
+     * @param exchangeNo
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Override
+    public IPage<Map> list(IPage<Map> iPage, Long serviceId, Long createUserId, DelayWarnTypeEnum type, ProductTypeEnum customType, ProjectExchangeFlowStatusEnum flowStatus, String customName, String exchangeNo, Long startTime, Long endTime) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        createUserId = Objects.isNull(createUserId) ? sysUser.getId() : createUserId;
+        return this.baseMapper.list(iPage, serviceId, createUserId, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(customType) ? customType.name() : null, Objects.nonNull(flowStatus) ? flowStatus.name() : null, customName, exchangeNo, startTime, endTime);
+    }
 }

sop-business/src/main/resources/db/log/shudonghui_update_log.sql

@@ -251,7 +251,8 @@ CREATE TABLE `sys_device_brand` (
                                     `update_id` bigint DEFAULT NULL COMMENT '更新人id',
                                     `update_time` bigint DEFAULT NULL COMMENT '更新时间',
                                     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='设备品牌表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备品牌表';
+
 CREATE TABLE `sys_device_model` (
                                     `id` bigint NOT NULL COMMENT '主键',
                                     `brand_id` bigint NOT NULL COMMENT '品牌ID',
@@ -261,8 +262,9 @@ CREATE TABLE `sys_device_model` (
                                     `update_id` bigint DEFAULT NULL COMMENT '更新人id',
                                     `update_time` bigint DEFAULT NULL COMMENT '更新时间',
                                     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='设备品牌型号表';
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1044, '设备品牌表列表接口', '/api/sys/device/brand/list', 'URL', 64, 25, 'SYS', NULL, 1, 1, 0);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备品牌型号表';
+
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1045, '设备品牌表列表接口', '/api/sys/device/brand/list', 'URL', 64, 25, 'SYS', NULL, 1, 1, 0);
 UPDATE `sys_privilege` SET `name` = '设备配置', `url` = 'device', `type` = 'MENU', `parent_id` = 2, `sequence` = 3, `property` = NULL, `related` = '', `enable` = 1, `default_auth` = 0, `front_display` = 1 WHERE `id` = 5;
 UPDATE `sys_privilege` SET `name` = '列表', `url` = 'List', `type` = 'LIST', `parent_id` = 5, `sequence` = 1, `property` = 'AUTH', `related` = '275', `enable` = 1, `default_auth` = 0, `front_display` = 1 WHERE `id` = 85;
 UPDATE `sys_privilege` SET `name` = '查询条件', `url` = 'Condition', `type` = 'CONDITION', `parent_id` = 5, `sequence` = 1, `property` = 'AUTH', `related` = NULL, `enable` = 1, `default_auth` = 0, `front_display` = 1 WHERE `id` = 86;
@@ -275,8 +277,8 @@ UPDATE `sys_privilege` SET `name` = '设备禁用', `url` = '/api/sys/device/dis
 UPDATE `sys_privilege` SET `name` = '设备查询条件', `url` = '/api/sys/device/get', `type` = 'URL', `parent_id` = 5, `sequence` = 4, `property` = 'AUTH', `related` = NULL, `enable` = 1, `default_auth` = 1, `front_display` = 0 WHERE `id` = 273;
 UPDATE `sys_privilege` SET `name` = '设备列表', `url` = '/api/sys/device/list', `type` = 'URL', `parent_id` = 5, `sequence` = 5, `property` = 'AUTH', `related` = NULL, `enable` = 1, `default_auth` = 1, `front_display` = 0 WHERE `id` = 274;
 UPDATE `sys_privilege` SET `name` = '设备查询条件', `url` = '/api/sys/device/query', `type` = 'URL', `parent_id` = 5, `sequence` = 6, `property` = 'AUTH', `related` = NULL, `enable` = 1, `default_auth` = 1, `front_display` = 0 WHERE `id` = 275;
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1045, '设备启用', '/api/sys/device/enable', 'URL', 5, 7, 'AUTH', NULL, 1, 1, 0);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1046, '设备导入', '/api/sys/device/import', 'URL', 5, 8, 'AUTH', NULL, 1, 1, 0);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1047, '启用', 'Select', 'BUTTON', 5, 4, 'AUTH', '1045', 1, 0, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1048, '禁用', 'Select', 'BUTTON', 5, 5, 'AUTH', '272', 1, 0, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1049, '导入', 'Select', 'BUTTON', 5, 6, 'AUTH', '1046', 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1046, '设备启用', '/api/sys/device/enable', 'URL', 5, 7, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1047, '设备导入', '/api/sys/device/import', 'URL', 5, 8, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1048, '启用', 'Select', 'BUTTON', 5, 4, 'AUTH', '1045', 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1049, '禁用', 'Select', 'BUTTON', 5, 5, 'AUTH', '272', 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1050, '导入', 'Select', 'BUTTON', 5, 6, 'AUTH', '1046', 1, 0, 1);

sop-business/src/main/resources/mapper/TBProjectExchangeMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.sop.business.mapper.TBProjectExchangeMapper">
 
+    <select id="list" resultType="java.util.Map">
+
+    </select>
 </mapper>

sop-common/src/main/java/com/qmth/sop/common/enums/EnumList.java

@@ -39,7 +39,13 @@ public enum EnumList {
 
     DEVICE_USAGE_TYPE_ENUM(DeviceUsageTypeEnum.class),
 
-    WARN_TYPE_ENUM(WarnTypeEnum.class);
+    WARN_TYPE_ENUM(WarnTypeEnum.class),
+
+    DELAY_WARN_TYPE_ENUM(DelayWarnTypeEnum.class),
+
+    PRODUCT_TYPE_ENUM(ProductTypeEnum.class),
+
+    PROJECT_EXCHANGE_FLOW_STATUS_ENUM(ProjectExchangeFlowStatusEnum.class);
 
     private Object obj;
 

sop-common/src/main/java/com/qmth/sop/common/enums/ProjectExchangeFlowStatusEnum.java

@@ -0,0 +1,24 @@
+package com.qmth.sop.common.enums;
+
+/**
+ * @Description: 项目计划变更流程enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2023/8/25
+ */
+public enum ProjectExchangeFlowStatusEnum {
+    UN_APPROVE("待审核"),
+
+    APPROVE("已审核");
+
+    ProjectExchangeFlowStatusEnum(String title) {
+        this.title = title;
+    }
+
+    private final String title;
+
+    public String getTitle() {
+        return title;
+    }
+}

sop-common/src/main/java/com/qmth/sop/common/enums/TFCustomTypeEnum.java

@@ -15,7 +15,7 @@ public enum TFCustomTypeEnum {
 
     DING_EXCEPTION_FLOW("考勤异常审核流程", "dingExceptionFlow", "dingExceptionFlow.zip","DE"),
 
-    PROJECT_EXCHANGE_FLOW("项目计划变更流程", "projectExchangeFlow", "projectExchangeFlow.zip","SOP_E"),
+    PROJECT_EXCHANGE_FLOW("项目计划变更流程", "projectExchangeFlow", "projectExchangeFlow.zip","PE"),
 
     QUALITY_PROBLEM_FLOW("质量问题反馈流程", "qualityProblemFlow", "qualityProblemFlow.zip","QF");
 

sop-server/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -484,6 +484,24 @@ public class SysController {
                     map.put(warnTypeEnum, warnTypeEnum.getTitle());
                 }
                 break;
+            case DELAY_WARN_TYPE_ENUM://变更类型
+                DelayWarnTypeEnum[] delayWarnTypeEnums = DelayWarnTypeEnum.values();
+                for (DelayWarnTypeEnum delayWarnTypeEnum : delayWarnTypeEnums) {
+                    map.put(delayWarnTypeEnum, delayWarnTypeEnum.getTitle());
+                }
+                break;
+            case PRODUCT_TYPE_ENUM://客户/产品类型
+                ProductTypeEnum[] productTypeEnums = ProductTypeEnum.values();
+                for (ProductTypeEnum productTypeEnum : productTypeEnums) {
+                    map.put(productTypeEnum, productTypeEnum.getTitle());
+                }
+                break;
+            case PROJECT_EXCHANGE_FLOW_STATUS_ENUM://项目计划变更流程状态类型
+                ProjectExchangeFlowStatusEnum[] projectExchangeFlowStatusEnums = ProjectExchangeFlowStatusEnum.values();
+                for (ProjectExchangeFlowStatusEnum projectExchangeFlowStatusEnum : projectExchangeFlowStatusEnums) {
+                    map.put(projectExchangeFlowStatusEnum, projectExchangeFlowStatusEnum.getTitle());
+                }
+                break;
             default:
                 break;
         }

sop-server/src/main/java/com/qmth/sop/server/api/TBProjectExchangeController.java

@@ -1,23 +1,26 @@
 package com.qmth.sop.server.api;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.entity.TBProjectExchange;
 import com.qmth.sop.business.service.TBProjectExchangeService;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.DelayWarnTypeEnum;
+import com.qmth.sop.common.enums.ProductTypeEnum;
+import com.qmth.sop.common.enums.ProjectExchangeFlowStatusEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 
 /**
  * <p>
@@ -45,4 +48,21 @@ public class TBProjectExchangeController {
         }
         return ResultUtil.ok(tbProjectExchangeService.saveProjectExchange(tbProjectExchange));
     }
+
+    @ApiOperation(value = "项目变更计划列表接口")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
+    public Result list(@ApiParam(value = "服务单元id") @RequestParam(required = false) Long serviceId,
+                       @ApiParam(value = "提交人id") @RequestParam(required = false) Long createUserId,
+                       @ApiParam(value = "变更类型") @RequestParam(required = false) DelayWarnTypeEnum type,
+                       @ApiParam(value = "客户类型") @RequestParam(required = false) ProductTypeEnum customType,
+                       @ApiParam(value = "流程状态") @RequestParam(required = false) ProjectExchangeFlowStatusEnum flowStatus,
+                       @ApiParam(value = "客户名称") @RequestParam(required = false) String customName,
+                       @ApiParam(value = "变更申请编号") @RequestParam(required = false) String exchangeNo,
+                       @ApiParam(value = "提交开始时间") @RequestParam(required = false) Long startTime,
+                       @ApiParam(value = "提交结束时间") @RequestParam(required = false) Long endTime,
+                       @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok(tbProjectExchangeService.list(new Page<>(pageNumber, pageSize), serviceId, createUserId, type, customType, flowStatus, customName, exchangeNo, startTime, endTime));
+    }
 }

sop-server/src/main/resources/projectExchangeFlow.bpmn

@@ -14,23 +14,16 @@
       </multiInstanceLoopCharacteristics>
     </userTask>
     <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_project_exchange_apply_1"></sequenceFlow>
-    <exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>
     <sequenceFlow id="flow14" sourceRef="f_usertask_project_exchange_apply_1" targetRef="f_usertask_project_exchange_approve_2"></sequenceFlow>
-    <sequenceFlow id="flow15" name="驳回" sourceRef="exclusivegateway2" targetRef="f_usertask_project_exchange_apply_1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_project_exchange_apply_1'}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow16" sourceRef="f_usertask_project_exchange_approve_2" targetRef="exclusivegateway2"></sequenceFlow>
-    <sequenceFlow id="flow17" name="通过" sourceRef="exclusivegateway2" targetRef="f_usertask_project_exchange_end_0">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_project_exchange_end_0'}]]></conditionExpression>
-    </sequenceFlow>
+    <sequenceFlow id="flow18" sourceRef="f_usertask_project_exchange_approve_2" targetRef="f_usertask_project_exchange_end_0"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_PROJECT_EXCHANGE_FLOW">
     <bpmndi:BPMNPlane bpmnElement="PROJECT_EXCHANGE_FLOW" id="BPMNPlane_PROJECT_EXCHANGE_FLOW">
       <bpmndi:BPMNShape bpmnElement="f_usertask_project_exchange_end_0" id="BPMNShape_f_usertask_project_exchange_end_0">
-        <omgdc:Bounds height="35.0" width="35.0" x="475.0" y="360.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="360.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_project_exchange_approve_2" id="BPMNShape_f_usertask_project_exchange_approve_2">
-        <omgdc:Bounds height="55.0" width="85.0" x="450.0" y="130.0"></omgdc:Bounds>
+        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="240.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
         <omgdc:Bounds height="35.0" width="35.0" x="240.0" y="40.0"></omgdc:Bounds>
@@ -38,35 +31,17 @@
       <bpmndi:BPMNShape bpmnElement="f_usertask_project_exchange_apply_1" id="BPMNShape_f_usertask_project_exchange_apply_1">
         <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="130.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="BPMNShape_exclusivegateway2">
-        <omgdc:Bounds height="40.0" width="40.0" x="472.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
         <omgdi:waypoint x="257.0" y="75.0"></omgdi:waypoint>
         <omgdi:waypoint x="257.0" y="130.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
-        <omgdi:waypoint x="300.0" y="157.0"></omgdi:waypoint>
-        <omgdi:waypoint x="450.0" y="157.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15">
-        <omgdi:waypoint x="472.0" y="260.0"></omgdi:waypoint>
-        <omgdi:waypoint x="257.0" y="260.0"></omgdi:waypoint>
         <omgdi:waypoint x="257.0" y="185.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="472.0" y="260.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow16" id="BPMNEdge_flow16">
-        <omgdi:waypoint x="492.0" y="185.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="240.0"></omgdi:waypoint>
+        <omgdi:waypoint x="257.0" y="240.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17">
-        <omgdi:waypoint x="492.0" y="280.0"></omgdi:waypoint>
-        <omgdi:waypoint x="492.0" y="360.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="100.0" x="492.0" y="280.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNEdge bpmnElement="flow18" id="BPMNEdge_flow18">
+        <omgdi:waypoint x="257.0" y="295.0"></omgdi:waypoint>
+        <omgdi:waypoint x="257.0" y="360.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>