完善

platform-common/src/main/java/com/platform/common/bean/BaseDTO.java

@@ -106,6 +106,15 @@ public class BaseDTO implements Serializable {
 
     private String taskId;
 
+    /**
+     * 转签审批人
+     */
+    private String changeUser;
+    /**
+     * 审批备注
+     */
+    private String refuseReason;
+
     /**
      * 设置用户信息
      */

platform-common/src/main/java/com/platform/common/util/IdGeneratorUtils.java

@@ -246,6 +246,16 @@ public class IdGeneratorUtils {
         return getProjectNum("BXD", countNum);
     }
 
+    /**
+     * 生成报废单号
+     *
+     * @param countNum
+     * @return
+     */
+    public static String getSbScrapFormNo(Integer countNum) {
+        return getProjectNum("BFD", countNum);
+    }
+
     /**
      * 生成点检标准编码
      *

platform-dao/src/main/java/com/platform/dao/dto/activiti/ActivitiUserModelDTO.java

@@ -51,6 +51,17 @@ public class ActivitiUserModelDTO extends BaseDTO implements Serializable {
      * 指定角色
      */
     private String roleId;
+
+    /**
+     * 指定部门:指定部门下面的角色的时候，需要设置roleId,
+     * 指定部门下面的某些角色的时候，需要设置roleList
+     * 指定发起人部门角色的时候，deptId,不需要设置，流程启动的时候，会自己找到发起人部门的deptId
+     */
+    private String deptId;
+    /**
+     * 指定角色多个["1","2"]
+     */
+    private String roleIdList;
     /**
      * 候选用户，候选用户设置办理人不是很多的情况下使用，而且需要签收，
      * 也就是说我们常说的抢件模式,设置候选组的前提是没有指定Assignee，（即没有执行签收操作）。

platform-dao/src/main/java/com/platform/dao/dto/sb/SbScrapFormDTO.java

@@ -0,0 +1,124 @@
+package com.platform.dao.dto.sb;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Transient;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 设备报废单DTO
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class SbScrapFormDTO extends BaseDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+    /**
+     * 入库单号
+     */
+    private String no;
+    /**
+     * 设备Id
+     */
+    private String sbId;
+    /**
+     * 设备编号
+     */
+    private String sbNo;
+    /**
+     * 设备原值/购置价值
+     */
+    private Double initialValue;
+    /**
+     * 当前价值
+     */
+    private Double currentValue;
+    /**
+     * 投用日期
+     */
+    private LocalDate startDate;
+    private Double workYear;// 预计工作年限(年为单位)
+    /**
+     * 报废原因
+     */
+    private String reason;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态
+     */
+    private Integer status;
+    /**
+     * 申请人
+     */
+    private String applyUserId;
+    /**
+     * 申请人名称
+     */
+    private String applyUserName;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 创建日期开始
+     */
+    private LocalDateTime createdTimeStart;
+    /**
+     * 创建日期结束
+     */
+    private LocalDateTime createdTimeEnd;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 更新日期开始
+     */
+    private LocalDateTime updateTimeStart;
+    /**
+     * 更新日期结束
+     */
+    private LocalDateTime updateTimeEnd;
+    /**
+     * 关键字
+     */
+    private String keyword;
+    /**
+     * 实例ID
+     */
+    private String processInstanceId;
+}

platform-dao/src/main/java/com/platform/dao/dto/ticket/TicketDTO.java

@@ -1,66 +0,0 @@
-package com.platform.dao.dto.ticket;
-
-import com.platform.common.bean.BaseDTO;
-import com.platform.common.validation.group.UpdateGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 两票工作票标准票DTO
- * @Author future
- * @Date 2020-07-21 14:52:21
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketDTO extends BaseDTO implements Serializable {
-
-      /**
-     * id
-     */
-        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
-    private String id;
-          /**
-     * 编号
-     */
-          private String no;
-          /**
-     * 工作票类别
-     */
-          private String type;
-          /**
-     * 工作任务
-     */
-          private String content;
-          /**
-     * 状态0：已废弃1：启用中
-     */
-          private Integer status;
-          /**
-     * 备注
-     */
-          private String remark;
-          /**
-     * 创建人
-     */
-          private String createdUserId;
-          /**
-     * 创建日期
-     */
-          private LocalDateTime createdTime;
-          /**
-     * 更新日期
-     */
-          private LocalDateTime updateTime;
-        /**
-     * 关键字
-     */
-  private String keyword;
-
-}

platform-dao/src/main/java/com/platform/dao/dto/ticket/TicketExecuteDTO.java

@@ -1,194 +0,0 @@
-package com.platform.dao.dto.ticket;
-
-import com.platform.common.bean.BaseDTO;
-import com.platform.common.validation.group.UpdateGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票执行DTO
- * @Author future
- * @Date 2020-07-21 14:54:12
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketExecuteDTO extends BaseDTO implements Serializable {
-
-      /**
-     * id
-     */
-        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
-    private String id;
-          /**
-     * 编号
-     */
-          private String no;
-          /**
-     * 工作票类别
-     */
-          private String type;
-          /**
-     * 工作负责人
-     */
-          private String chargeUserId;
-          /**
-     * 工作班人员
-     */
-          private String workBanUserId;
-          /**
-     * 工作站变电站名称
-     */
-          private String stationName;
-          /**
-     * 工作任务
-     */
-          private String content;
-          /**
-     * 计划工作开始时间
-     */
-          private LocalDateTime planStartTime;
-          /**
-     * 计划工作结束时间
-     */
-          private LocalDateTime planEndTime;
-          /**
-     * 签发人签名
-     */
-          private String signUserId;
-          /**
-     * 签发日期
-     */
-          private LocalDateTime signDateTime;
-          /**
-     * 收到工作票时间
-     */
-          private LocalDateTime receiveDateTime;
-          /**
-     * 运行值班人员签名
-     */
-          private String zhibaoUserId;
-          /**
-     * 工作负责人签名
-     */
-          private String signChargeUserId;
-          /**
-     * 确认工作票时间
-     */
-          private LocalDateTime sureDateTime;
-          /**
-     * 工作负责人确认内容签名
-     */
-          private String sureChargeUserId;
-          /**
-     * 工作许可人确认内容签名
-     */
-          private String sureXukeUserId;
-          /**
-     * 许可开始工作时间
-     */
-          private LocalDateTime xuekeStartDateTime;
-          /**
-     * 确认工作任务和安全措施签名
-     */
-          private String sureContentSignUserId;
-          /**
-     * 原工作负责人
-     */
-          private String oldChargeUserId;
-          /**
-     * 工作负责人变动时间
-     */
-          private LocalDateTime changeDateTime;
-          /**
-     * 工作负责人变动签名
-     */
-          private String changeSignUserId;
-          /**
-     * 工作人员变动情况1
-     */
-          private String workUserChangeSituation;
-          /**
-     * 工作人员变动情况2
-     */
-          private String workUserChangeSituationTwo;
-          /**
-     * 工作人员变动情况时间1
-     */
-          private LocalDateTime workUserChangeSituationTime;
-          /**
-     * 工作人员变动情况时间2
-     */
-          private LocalDateTime workUserChangeSituationTimeTwo;
-          /**
-     * 工作人员变动签名
-     */
-          private String workUserChangeSituationSignUserId;
-          /**
-     * 工作票延期截止时间
-     */
-          private LocalDateTime yqEndDateTime;
-          /**
-     * 工作票延期工作负责人签名
-     */
-          private String yqChargeSignUserId;
-          /**
-     * 工作票延期工作许可人签名
-     */
-          private String yqXukeSignUserId;
-          /**
-     * 工作终结时间
-     */
-          private LocalDateTime workFinishDateTime;
-          /**
-     * 工作终结负责人签名
-     */
-          private String workFinishChargeUserId;
-          /**
-     * 工作终结许可人签名
-     */
-          private String workFinishXukeUserId;
-          /**
-     * 工作票终结时间
-     */
-          private LocalDateTime ticketFinishDateTime;
-          /**
-     * 工作票终结许可人签名
-     */
-          private String ticketFinishXukeUserId;
-          /**
-     * 工作票终结备注
-     */
-          private LocalDateTime ticketFinishRemark;
-          /**
-     * 状态0：已废弃1：执行中2：已退票3：工作已终结4：工作票已终结
-     */
-          private Integer status;
-          /**
-     * 备注
-     */
-          private String remark;
-          /**
-     * 创建日期
-     */
-          private LocalDateTime createdTime;
-          /**
-     * 更新日期
-     */
-          private LocalDateTime updateTime;
-          /**
-     * 创建人
-     */
-          private String createdUserId;
-        /**
-     * 关键字
-     */
-  private String keyword;
-
-}

platform-dao/src/main/java/com/platform/dao/dto/ticket/TicketSafeDTO.java

@@ -1,74 +0,0 @@
-package com.platform.dao.dto.ticket;
-
-import com.platform.common.bean.BaseDTO;
-import com.platform.common.validation.group.UpdateGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票安措DTO
- * @Author future
- * @Date 2020-07-21 14:53:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketSafeDTO extends BaseDTO implements Serializable {
-
-      /**
-     * id
-     */
-        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
-    private String id;
-          /**
-     * 所属工作票
-     */
-          private String ticketId;
-          /**
-     * 安全类别
-     */
-          private String type;
-          /**
-     * 安措名称
-     */
-          private String name;
-          /**
-     * 安措内容
-     */
-          private String content;
-          /**
-     * 危险等级
-     */
-          private Integer dangerLevel;
-          /**
-     * 备注
-     */
-          private String remark;
-          /**
-     * 状态0：已废弃 1：启用中
-     */
-          private Integer status;
-          /**
-     * 创建人
-     */
-          private String createdUserId;
-          /**
-     * 创建日期
-     */
-          private LocalDateTime createdTime;
-          /**
-     * 更新日期
-     */
-          private LocalDateTime updateTime;
-        /**
-     * 关键字
-     */
-  private String keyword;
-
-}

platform-dao/src/main/java/com/platform/dao/dto/ticket/TicketSafeExecuteDTO.java

@@ -1,78 +0,0 @@
-package com.platform.dao.dto.ticket;
-
-import com.platform.common.bean.BaseDTO;
-import com.platform.common.validation.group.UpdateGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票安措执行DTO
- * @Author future
- * @Date 2020-07-21 15:05:29
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketSafeExecuteDTO extends BaseDTO implements Serializable {
-
-      /**
-     * id
-     */
-        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
-    private String id;
-          /**
-     * 所属工作票执行单
-     */
-          private String ticketExcuteId;
-          /**
-     * 安措类别
-     */
-          private String type;
-          /**
-     * 安措名称
-     */
-          private String name;
-          /**
-     * 安措内容
-     */
-          private String content;
-          /**
-     * 危险等级
-     */
-          private Integer dangerLevel;
-          /**
-     * 来源1：签发单2：现场补充
-     */
-          private Integer source;
-          /**
-     * 状态1：待执行2：已执行3：已废弃
-     */
-          private Integer status;
-          /**
-     * 备注
-     */
-          private String remark;
-          /**
-     * 创建人
-     */
-          private String createdUserId;
-          /**
-     * 创建日期
-     */
-          private LocalDateTime createdTime;
-          /**
-     * 更新日期
-     */
-          private LocalDateTime updateTime;
-        /**
-     * 关键字
-     */
-  private String keyword;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/activiti/ActivitiUserModel.java

@@ -7,8 +7,10 @@ import javax.persistence.Table;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+
 import lombok.experimental.Accessors;
 import com.platform.common.bean.DataScope;
+
 import javax.persistence.Transient;
 
 /**
@@ -20,12 +22,12 @@ import javax.persistence.Transient;
 @Data
 @Accessors(chain = true)
 @Table(name = "t_activiti_user_model")
-public class ActivitiUserModel implements Serializable{
+public class ActivitiUserModel implements Serializable {
 
     /**
      * 编号
      */
-        @Id
+    @Id
     private String id;
     /**
      * 模型id
@@ -51,6 +53,16 @@ public class ActivitiUserModel implements Serializable{
      * 指定角色
      */
     private String roleId;
+    /**
+     * 指定部门:指定部门下面的角色的时候，需要设置roleId,
+     * 指定部门下面的某些角色的时候，需要设置roleList
+     * 指定发起人部门角色的时候，deptId,不需要设置，流程启动的时候，会自己找到发起人部门的deptId
+     */
+    private String deptId;
+    /**
+     * 指定角色多个["1","2"]
+     */
+    private String roleIdList;
     /**
      * 候选用户，候选用户设置办理人不是很多的情况下使用，而且需要签收，
      * 也就是说我们常说的抢件模式,设置候选组的前提是没有指定Assignee，（即没有执行签收操作）。
@@ -97,9 +109,9 @@ public class ActivitiUserModel implements Serializable{
      */
     private String updateUserName;
 
-   /**
-    * 数据权限
-    */
+    /**
+     * 数据权限
+     */
     @Transient
     private DataScope dataScope;
 

platform-dao/src/main/java/com/platform/dao/entity/work/WorkStandard.java → platform-dao/src/main/java/com/platform/dao/entity/sb/SbScrapForm.java

@@ -1,26 +1,26 @@
-package com.platform.dao.entity.work;
+package com.platform.dao.entity.sb;
 
-import com.platform.common.bean.DataScope;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.List;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
 
 /**
- * @Description 点检标准实体类
- * @Author liuyu
- * @Date 2020-05-28 17:23:30
+ * @Description 设备报废单实体类
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
 @Accessors(chain = true)
-@Table(name = "t_work_standard")
-public class WorkStandard implements Serializable{
+@Table(name = "t_sb_scrap_form")
+public class SbScrapForm implements Serializable{
 
     /**
      * 主键
@@ -28,64 +28,69 @@ public class WorkStandard implements Serializable{
         @Id
     private String id;
     /**
-     * 标准名称
-     */
-    private String name;
-    /**
-     * 编码
+     * 入库单号
      */
     private String no;
     /**
-     * 检查类型: 1-点检 2-巡检
+     * 设备Id
      */
-    private Integer type;
+    private String sbId;
     /**
-     * 是否启用: 0-否 1-是
+     * 设备编号
      */
-    private Integer enable;
+    private String sbNo;
     /**
-     * 要求
+     * 报废原因
      */
-    private String requirement;
+    private String reason;
     /**
      * 备注
      */
     private String remark;
     /**
-     * 创建人
+     * 状态
      */
-    private String createdUserId;
+    private Integer status;
     /**
-     * 更新人
+     * 申请人
      */
-    private String updateUserId;
+    private String applyUserId;
+    /**
+     * 申请人名称
+     */
+    private String applyUserName;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
     /**
      * 创建人名称
      */
     private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
     /**
      * 更新人名称
      */
     private String updateUserName;
     /**
-     * 创建时间
+     * 创建日期
      */
     private LocalDateTime createdTime;
     /**
-     * 更新时间
+     * 更新日期
      */
     private LocalDateTime updateTime;
-
+    /**
+     * 实例ID
+     */
+    private String processInstanceId;
    /**
     * 数据权限
     */
     @Transient
     private DataScope dataScope;
 
-    /**
-     * 标准参数
-     */
-    @Transient
-    private List<WorkStandardParam> paramList;
-
 }

platform-dao/src/main/java/com/platform/dao/entity/ticket/Ticket.java

@@ -1,69 +0,0 @@
-package com.platform.dao.entity.ticket;
-
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-import lombok.experimental.Accessors;
-import com.platform.common.bean.DataScope;
-import javax.persistence.Transient;
-
-/**
- * @Description 两票工作票标准票实体类
- * @Author future
- * @Date 2020-07-21 14:52:21
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_ticket")
-public class Ticket implements Serializable{
-
-    /**
-     * id
-     */
-        @Id
-    private String id;
-    /**
-     * 编号
-     */
-    private String no;
-    /**
-     * 工作票类别
-     */
-    private String type;
-    /**
-     * 工作任务
-     */
-    private String content;
-    /**
-     * 状态0：已废弃1：启用中
-     */
-    private Integer status;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/ticket/TicketExecute.java

@@ -1,197 +0,0 @@
-package com.platform.dao.entity.ticket;
-
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-import lombok.experimental.Accessors;
-import com.platform.common.bean.DataScope;
-import javax.persistence.Transient;
-
-/**
- * @Description 工作票执行实体类
- * @Author future
- * @Date 2020-07-21 14:54:12
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_ticket_execute")
-public class TicketExecute implements Serializable{
-
-    /**
-     * id
-     */
-        @Id
-    private String id;
-    /**
-     * 编号
-     */
-    private String no;
-    /**
-     * 工作票类别
-     */
-    private String type;
-    /**
-     * 工作负责人
-     */
-    private String chargeUserId;
-    /**
-     * 工作班人员
-     */
-    private String workBanUserId;
-    /**
-     * 工作站变电站名称
-     */
-    private String stationName;
-    /**
-     * 工作任务
-     */
-    private String content;
-    /**
-     * 计划工作开始时间
-     */
-    private LocalDateTime planStartTime;
-    /**
-     * 计划工作结束时间
-     */
-    private LocalDateTime planEndTime;
-    /**
-     * 签发人签名
-     */
-    private String signUserId;
-    /**
-     * 签发日期
-     */
-    private LocalDateTime signDateTime;
-    /**
-     * 收到工作票时间
-     */
-    private LocalDateTime receiveDateTime;
-    /**
-     * 运行值班人员签名
-     */
-    private String zhibaoUserId;
-    /**
-     * 工作负责人签名
-     */
-    private String signChargeUserId;
-    /**
-     * 确认工作票时间
-     */
-    private LocalDateTime sureDateTime;
-    /**
-     * 工作负责人确认内容签名
-     */
-    private String sureChargeUserId;
-    /**
-     * 工作许可人确认内容签名
-     */
-    private String sureXukeUserId;
-    /**
-     * 许可开始工作时间
-     */
-    private LocalDateTime xuekeStartDateTime;
-    /**
-     * 确认工作任务和安全措施签名
-     */
-    private String sureContentSignUserId;
-    /**
-     * 原工作负责人
-     */
-    private String oldChargeUserId;
-    /**
-     * 工作负责人变动时间
-     */
-    private LocalDateTime changeDateTime;
-    /**
-     * 工作负责人变动签名
-     */
-    private String changeSignUserId;
-    /**
-     * 工作人员变动情况1
-     */
-    private String workUserChangeSituation;
-    /**
-     * 工作人员变动情况2
-     */
-    private String workUserChangeSituationTwo;
-    /**
-     * 工作人员变动情况时间1
-     */
-    private LocalDateTime workUserChangeSituationTime;
-    /**
-     * 工作人员变动情况时间2
-     */
-    private LocalDateTime workUserChangeSituationTimeTwo;
-    /**
-     * 工作人员变动签名
-     */
-    private String workUserChangeSituationSignUserId;
-    /**
-     * 工作票延期截止时间
-     */
-    private LocalDateTime yqEndDateTime;
-    /**
-     * 工作票延期工作负责人签名
-     */
-    private String yqChargeSignUserId;
-    /**
-     * 工作票延期工作许可人签名
-     */
-    private String yqXukeSignUserId;
-    /**
-     * 工作终结时间
-     */
-    private LocalDateTime workFinishDateTime;
-    /**
-     * 工作终结负责人签名
-     */
-    private String workFinishChargeUserId;
-    /**
-     * 工作终结许可人签名
-     */
-    private String workFinishXukeUserId;
-    /**
-     * 工作票终结时间
-     */
-    private LocalDateTime ticketFinishDateTime;
-    /**
-     * 工作票终结许可人签名
-     */
-    private String ticketFinishXukeUserId;
-    /**
-     * 工作票终结备注
-     */
-    private LocalDateTime ticketFinishRemark;
-    /**
-     * 状态0：已废弃1：执行中2：已退票3：工作已终结4：工作票已终结
-     */
-    private Integer status;
-    /**
-     * 备注
-     */
-    private String remark1;
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-    private LocalDateTime updateTime;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/ticket/TicketSafe.java

@@ -1,77 +0,0 @@
-package com.platform.dao.entity.ticket;
-
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-import lombok.experimental.Accessors;
-import com.platform.common.bean.DataScope;
-import javax.persistence.Transient;
-
-/**
- * @Description 工作票安措实体类
- * @Author future
- * @Date 2020-07-21 14:53:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_ticket_safe")
-public class TicketSafe implements Serializable{
-
-    /**
-     * id
-     */
-        @Id
-    private String id;
-    /**
-     * 所属工作票
-     */
-    private String ticketId;
-    /**
-     * 安全类别
-     */
-    private String type;
-    /**
-     * 安措名称
-     */
-    private String name;
-    /**
-     * 安措内容
-     */
-    private String content;
-    /**
-     * 危险等级
-     */
-    private Integer dangerLevel;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 状态0：已废弃 1：启用中
-     */
-    private Integer status;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/ticket/TicketSafeExecute.java

@@ -1,81 +0,0 @@
-package com.platform.dao.entity.ticket;
-
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-import lombok.experimental.Accessors;
-import com.platform.common.bean.DataScope;
-import javax.persistence.Transient;
-
-/**
- * @Description 工作票安措执行实体类
- * @Author future
- * @Date 2020-07-21 15:05:29
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_ticket_safe_execute")
-public class TicketSafeExecute implements Serializable{
-
-    /**
-     * id
-     */
-        @Id
-    private String id;
-    /**
-     * 所属工作票执行单
-     */
-    private String ticketExcuteId;
-    /**
-     * 安措类别
-     */
-    private String type;
-    /**
-     * 安措名称
-     */
-    private String name;
-    /**
-     * 安措内容
-     */
-    private String content;
-    /**
-     * 危险等级
-     */
-    private Integer dangerLevel;
-    /**
-     * 来源1：签发单2：现场补充
-     */
-    private Integer source;
-    /**
-     * 状态1：待执行2：已执行3：已废弃
-     */
-    private Integer status;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/work/WorkJob.java

@@ -1,125 +0,0 @@
-package com.platform.dao.entity.work;
-
-import com.platform.common.bean.DataScope;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @Description 点检记录实体类
- * @Author liuyu
- * @Date 2020-05-29 10:39:40
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_work_job")
-public class WorkJob implements Serializable {
-
-    /**
-     * 主键
-     */
-    @Id
-    private String id;
-    /**
-     * 任务名称
-     */
-    private String name;
-    /**
-     * 计划id
-     */
-    private String planId;
-    /**
-     * 设备Id
-     */
-    private String sbId;
-    /**
-     * 部件id
-     */
-    private String partId;
-    /**
-     * 标准id
-     */
-    private String standardId;
-    /**
-     * 要求
-     */
-    private String requirement;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 点检结果反馈
-     */
-    private String feedback;
-
-    /**
-     * 点检人id
-     */
-    private String checkUserId;
-    /**
-     * 点检人
-     */
-    private String checkUserName;
-    /**
-     * 任务开始时间
-     */
-    private LocalDateTime startTime;
-    /**
-     * 任务结束时间
-     */
-    private LocalDateTime endTime;
-    /**
-     * 实际开始时间
-     */
-    private LocalDateTime actualStartTime;
-    /**
-     * 实际结束时间
-     */
-    private LocalDateTime actualEndTime;
-    /**
-     * 任务状态: 1-未执行 2-执行中 3-已完成 4-已逾期
-     */
-    private Integer status;
-    /**
-     * 设备状态: 1-正常 2-停机
-     */
-    private Integer sbStatus;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 更新人
-     */
-    private String updateUserId;
-    /**
-     * 创建人名称
-     */
-    private String createdUserName;
-    /**
-     * 更新人名称
-     */
-    private String updateUserName;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 数据权限
-     */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/work/WorkPlan.java

@@ -1,125 +0,0 @@
-package com.platform.dao.entity.work;
-
-import com.platform.common.bean.DataScope;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * @Description 点检计划实体类
- * @Author liuyu
- * @Date 2020-05-29 10:15:36
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_work_plan")
-public class WorkPlan implements Serializable{
-
-    /**
-     * 主键
-     */
-        @Id
-    private String id;
-    /**
-     * 编码
-     */
-    private String no;
-    /**
-     * 计划名称
-     */
-    private String name;
-    /**
-     * 点检人id
-     */
-    private String checkUserId;
-    /**
-     * 点检人
-     */
-    private String checkUserName;
-    /**
-     * 计划周期
-     */
-    private Integer period;
-    /**
-     * 检查类型: 1-点检 2-巡检
-     */
-    private Integer type;
-    /**
-     * 周期类型: 1-天 2-周 3-月 4-季度 5-年
-     */
-    private Integer periodType;
-    /**
-     * 有效时间
-     */
-    private Integer validTime;
-    /**
-     * 有效时间类型: 1-天 2-周 3-月 4-季度 5-年
-     */
-    private Integer validTimeType;
-    /**
-     * 计划开始时间
-     */
-    private LocalDate startTime;
-    /**
-     * 计划结束时间
-     */
-    private LocalDate endTime;
-    /**
-     * 上次生成时间
-     */
-    private LocalDateTime lastGeneratedTime;
-    /**
-     * 是否启用: 0-否 1-是
-     */
-    private Integer enable;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 更新人
-     */
-    private String updateUserId;
-    /**
-     * 创建人名称
-     */
-    private String createdUserName;
-    /**
-     * 更新人名称
-     */
-    private String updateUserName;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-    /**
-     * 检查项目
-     */
-    @Transient
-    List<CheckProjectVO> projectList;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/work/WorkProject.java

@@ -1,80 +0,0 @@
-package com.platform.dao.entity.work;
-
-import com.platform.common.bean.DataScope;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @Description 点检项目实体类
- * @Author liuyu
- * @Date 2020-05-28 17:48:35
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_work_project")
-public class WorkProject implements Serializable{
-
-    /**
-     * 主键
-     */
-        @Id
-    private String id;
-    /**
-     * 编码
-     */
-    private String no;
-    /**
-     * 设备id
-     */
-    private String sbId;
-    /**
-     * 部件id
-     */
-    private String partId;
-    /**
-     * 是否启用: 0-否 1-是
-     */
-    private Integer enable;
-    /**
-     * 检查类型: 1-点检 2-巡检
-     */
-    private Integer type;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 更新人
-     */
-    private String updateUserId;
-    /**
-     * 创建人名称
-     */
-    private String createdUserName;
-    /**
-     * 更新人名称
-     */
-    private String updateUserName;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/work/WorkProjectPlanRelation.java

@@ -1,68 +0,0 @@
-package com.platform.dao.entity.work;
-
-import com.platform.common.bean.DataScope;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @Description 点检项目计划关联实体类
- * @Author liuyu
- * @Date 2020-05-28 18:32:33
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_work_project_plan_relation")
-public class WorkProjectPlanRelation implements Serializable{
-
-    /**
-     * 主键
-     */
-        @Id
-    private String id;
-    /**
-     * 计划id
-     */
-    private String planId;
-    /**
-     * 项目id
-     */
-    private String projectId;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 更新人
-     */
-    private String updateUserId;
-    /**
-     * 创建人名称
-     */
-    private String createdUserName;
-    /**
-     * 更新人名称
-     */
-    private String updateUserName;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/work/WorkProjectStandardRelation.java

@@ -1,68 +0,0 @@
-package com.platform.dao.entity.work;
-
-import com.platform.common.bean.DataScope;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @Description 点检项目标准关联实体类
- * @Author liuyu
- * @Date 2020-06-05 10:46:56
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_work_project_standard_relation")
-public class WorkProjectStandardRelation implements Serializable {
-
-    /**
-     * 主键
-     */
-    @Id
-    private String id;
-    /**
-     * 项目id
-     */
-    private String projectId;
-    /**
-     * 标准id
-     */
-    private String standardId;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 更新人
-     */
-    private String updateUserId;
-    /**
-     * 创建人名称
-     */
-    private String createdUserName;
-    /**
-     * 更新人名称
-     */
-    private String updateUserName;
-
-    /**
-     * 数据权限
-     */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/entity/work/WorkStandardParam.java

@@ -1,92 +0,0 @@
-package com.platform.dao.entity.work;
-
-import com.platform.common.bean.DataScope;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @Description 点检标准参数实体类
- * @Author liuyu
- * @Date 2020-05-29 10:09:49
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@Table(name = "t_work_standard_param")
-public class WorkStandardParam implements Serializable{
-
-    /**
-     * 主键
-     */
-        @Id
-    private String id;
-    /**
-     * 标准id
-     */
-    private String standardId;
-    /**
-     * 名称
-     */
-    private String name;
-    /**
-     * 类型: 1-数字 2-文本
-     */
-    private Integer type;
-    /**
-     * 上限
-     */
-    private String upperLimit;
-    /**
-     * 下限
-     */
-    private String lowerrLimit;
-    /**
-     * 参考值
-     */
-    private String referenceValue;
-    /**
-     * 正常选型
-     */
-    private String normalSelection;
-    /**
-     * 说明
-     */
-    private String instruction;
-    /**
-     * 创建人
-     */
-    private String createdUserId;
-    /**
-     * 更新人
-     */
-    private String updateUserId;
-    /**
-     * 创建人名称
-     */
-    private String createdUserName;
-    /**
-     * 更新人名称
-     */
-    private String updateUserName;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-   /**
-    * 数据权限
-    */
-    @Transient
-    private DataScope dataScope;
-
-}

platform-dao/src/main/java/com/platform/dao/enums/ActivitiFormStatusEnum.java

@@ -0,0 +1,54 @@
+package com.platform.dao.enums;
+
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 审批流业务表单状态
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum ActivitiFormStatusEnum {
+
+    /**
+     * 草稿
+     */
+    NOT_EXECUTE(1, "草稿"),
+    /**
+     * 审核中
+     */
+    EXECUTING(2, "审核中"),
+    /**
+     * 已通过
+     */
+    FINISH(3, "已通过"),
+    /**
+     * 已拒绝
+     */
+    REFUSE(4, "已拒绝");
+
+    private final Integer value;
+    private final String name;
+
+    //讲枚举转换成list格式，这样前台遍历的时候比较容易，列如 下拉框 后台调用toList方法，你就可以得到code 和name了
+    public static List<Map<String, Object>> toList() {
+        List<Map<String, Object>> list = Lists.newArrayList();//Lists.newArrayList()其实和new ArrayList()几乎一模
+        //  一样, 唯一它帮你做的(其实是javac帮你做的), 就是自动推导(不是"倒")尖括号里的数据类型.
+        for (ActivitiFormStatusEnum obj : ActivitiFormStatusEnum.values()) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("value", obj.getValue());
+            map.put("name", obj.getName());
+            list.add(map);
+        }
+        return list;
+    }
+
+}

platform-dao/src/main/java/com/platform/dao/enums/ActivitiUserModelTypeEnum.java

@@ -12,35 +12,38 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ActivitiUserModelTypeEnum {
-
     /**
-     * 	指定人员
+     * 	发起人:已实现
+     */
+    START_USER(1),
+    /**
+     * 	指定人员:已实现
      */
-    USER(1),
+    USER(2),
     /**
-     * 指定角色
+     * 指定角色:已实现
      */
-    ROLE(2),
+    ROLE(3),
     /**
-     * 	发起人
+     * 发起人部门,下面的单个角色:已实现
      */
-    START(3),
+    START_USER_DEPT_ROLE(4),
     /**
-     * 指定部门
+     * 发起人部门,下面的单些角色:
      */
-    DEPT(4),
+    START_USER_DEPT_ROLES(5),
     /**
-     * 指定部门主管
+     * 指定部门角色,某个部门下面的某个角色
      */
-    DEPTMANAGE(5),
+    DEPT_ROLE(6),
     /**
-     * 发起人部门负责人
+     * 指定部门角色,某个部门下面的某些角色
      */
-    STARTUSER(6),
+    DEPT_ROLES(7),
     /**
      * 表单变量
      */
-    VARIABLE(7);
+    VARIABLE(50);
 
     private Integer value;
 

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbScrapFormMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.sb;
+
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.sb.SbScrapForm;
+import com.platform.dao.vo.query.sb.SbScrapFormVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 设备报废单 mapper
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface SbScrapFormMapper extends MyMapper<SbScrapForm> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<SbScrapFormVO> selectList(SbScrapFormDTO dto);
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/ticket/TicketExecuteMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.ticket;
-
-import com.platform.dao.dto.ticket.TicketExecuteDTO;
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.entity.ticket.TicketExecute;
-import com.platform.dao.vo.query.ticket.TicketExecuteVO;
-import org.springframework.stereotype.Component;
-import java.util.List;
-
-
-/**
- * @Description 工作票执行 mapper
- * @Author future
- * @Date 2020-07-21 14:54:12
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface TicketExecuteMapper extends MyMapper<TicketExecute> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<TicketExecuteVO> selectList(TicketExecuteDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/ticket/TicketMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.ticket;
-
-import com.platform.dao.dto.ticket.TicketDTO;
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.entity.ticket.Ticket;
-import com.platform.dao.vo.query.ticket.TicketVO;
-import org.springframework.stereotype.Component;
-import java.util.List;
-
-
-/**
- * @Description 两票工作票标准票 mapper
- * @Author future
- * @Date 2020-07-21 14:52:21
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface TicketMapper extends MyMapper<Ticket> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<TicketVO> selectList(TicketDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/ticket/TicketSafeExecuteMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.ticket;
-
-import com.platform.dao.dto.ticket.TicketSafeExecuteDTO;
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.entity.ticket.TicketSafeExecute;
-import com.platform.dao.vo.query.ticket.TicketSafeExecuteVO;
-import org.springframework.stereotype.Component;
-import java.util.List;
-
-
-/**
- * @Description 工作票安措执行 mapper
- * @Author future
- * @Date 2020-07-21 15:05:29
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface TicketSafeExecuteMapper extends MyMapper<TicketSafeExecute> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<TicketSafeExecuteVO> selectList(TicketSafeExecuteDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/ticket/TicketSafeMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.ticket;
-
-import com.platform.dao.dto.ticket.TicketSafeDTO;
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.entity.ticket.TicketSafe;
-import com.platform.dao.vo.query.ticket.TicketSafeVO;
-import org.springframework.stereotype.Component;
-import java.util.List;
-
-
-/**
- * @Description 工作票安措 mapper
- * @Author future
- * @Date 2020-07-21 14:53:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface TicketSafeMapper extends MyMapper<TicketSafe> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<TicketSafeVO> selectList(TicketSafeDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkJobMapper.java

@@ -1,42 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckJobDTO;
-import com.platform.dao.entity.work.WorkJob;
-import com.platform.dao.vo.query.check.CheckJobVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检记录 mapper
- * @Author liuyu
- * @Date 2020-05-29 10:39:40
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkJobMapper extends MyMapper<WorkJob> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<CheckJobVO> selectList(CheckJobDTO dto);
-
-    /**
-     * 查询任务列表
-     * @param planId
-     * @return
-     */
-    List<CheckJobVO> selectJobList(@Param("planId") Object planId);
-
-    /**
-     * 查看详情
-     * @param id
-     * @return
-     */
-    CheckJobVO selectDetail(@Param("id") Object id);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkPlanMapper.java

@@ -1,36 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckPlanDTO;
-import com.platform.dao.entity.work.WorkPlan;
-import com.platform.dao.vo.query.check.CheckPlanVO;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检计划 mapper
- * @Author liuyu
- * @Date 2020-05-29 10:15:36
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkPlanMapper extends MyMapper<WorkPlan> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<CheckPlanVO> selectList(CheckPlanDTO dto);
-
-    /**
-     * 查询计划关联的项目信息
-     * @param planId
-     * @return
-     */
-    List<CheckProjectVO> selectPlanProjectList(@Param("planId") String planId);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkProjectMapper.java

@@ -1,43 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckProjectDTO;
-import com.platform.dao.entity.work.WorkProject;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import com.platform.dao.vo.query.check.CheckStandardVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检项目 mapper
- * @Author liuyu
- * @Date 2020-05-28 17:48:35
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkProjectMapper extends MyMapper<WorkProject> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<CheckProjectVO> selectList(CheckProjectDTO dto);
-
-    /**
-     * 查看详情
-     * @param id
-     * @return
-     */
-    CheckProjectVO selectDetail(@Param("id") Object id);
-
-    /**
-     * 查询标准列表
-     * @param id
-     * @return
-     */
-    List<CheckStandardVO> selectStandardList(@Param("id") Object id);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkProjectPlanRelationMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckProjectPlanRelationDTO;
-import com.platform.dao.entity.work.WorkProjectPlanRelation;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检项目计划关联 mapper
- * @Author liuyu
- * @Date 2020-05-28 18:32:33
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkProjectPlanRelationMapper extends MyMapper<WorkProjectPlanRelation> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<WorkProjectPlanRelation> selectList(CheckProjectPlanRelationDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkProjectStandardRelationMapper.java

@@ -1,27 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
-import com.platform.dao.entity.work.WorkProjectStandardRelation;
-import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检项目标准关联 mapper
- * @Author liuyu
- * @Date 2020-06-05 10:46:56
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkProjectStandardRelationMapper extends MyMapper<WorkProjectStandardRelation> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<CheckProjectStandardRelationVO> selectList(CheckProjectStandardRelationDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkStandardMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckStandardDTO;
-import com.platform.dao.entity.work.WorkStandard;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检标准 mapper
- * @Author liuyu
- * @Date 2020-05-28 17:23:30
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkStandardMapper extends MyMapper<WorkStandard> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<WorkStandard> selectList(CheckStandardDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/mapper/work/WorkStandardParamMapper.java

@@ -1,26 +0,0 @@
-package com.platform.dao.mapper.work;
-
-import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.check.CheckStandardParamDTO;
-import com.platform.dao.entity.work.WorkStandardParam;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description 点检标准参数 mapper
- * @Author liuyu
- * @Date 2020-05-29 10:09:49
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Component
-public interface WorkStandardParamMapper extends MyMapper<WorkStandardParam> {
-    /**
-     * 分页查询
-     * @param dto
-     * @return
-     */
-    List<WorkStandardParam> selectList(CheckStandardParamDTO dto);
-
-}

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbScrapFormVO.java

@@ -0,0 +1,116 @@
+package com.platform.dao.vo.export.sb;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 设备报废单导出VO
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportSbScrapFormVO implements Serializable {
+
+    /**
+   * 主键
+   */
+          @Excel(name = "主键", orderNum = "1")
+      private String id;
+    
+    /**
+   * 入库单号
+   */
+          @Excel(name = "入库单号", orderNum = "2")
+      private String no;
+    
+    /**
+   * 设备Id
+   */
+          @Excel(name = "设备Id", orderNum = "3")
+      private Integer sbId;
+      /**
+       * 设备Id -名称
+       */
+      @Excel(name = "设备Id", orderNum = "3")
+      private String sbInfoName;
+    
+    /**
+   * 设备编号
+   */
+          @Excel(name = "设备编号", orderNum = "4")
+      private String sbNo;
+    
+    /**
+   * 仓库id
+   */
+          @Excel(name = "仓库id", orderNum = "5")
+      private String reason;
+    
+    /**
+   * 备注
+   */
+          @Excel(name = "备注", orderNum = "6")
+      private String remark;
+    
+    /**
+   * 状态
+   */
+          @Excel(name = "状态", orderNum = "7")
+      private Integer status;
+    
+    /**
+   * 申请人
+   */
+          @Excel(name = "申请人", orderNum = "8")
+      private String applyUserId;
+    
+    /**
+   * 申请人名称
+   */
+          @Excel(name = "申请人名称", orderNum = "9")
+      private String applyUserName;
+    
+    /**
+   * 创建人
+   */
+          @Excel(name = "创建人", orderNum = "10")
+      private String createdUserId;
+    
+    /**
+   * 创建人名称
+   */
+          @Excel(name = "创建人名称", orderNum = "11")
+      private String createdUserName;
+    
+    /**
+   * 更新人
+   */
+          @Excel(name = "更新人", orderNum = "12")
+      private String updateUserId;
+    
+    /**
+   * 更新人名称
+   */
+          @Excel(name = "更新人名称", orderNum = "13")
+      private String updateUserName;
+    
+    /**
+   * 创建日期
+   */
+          @Excel(name = "创建日期", orderNum = "14")
+      private LocalDateTime createdTime;
+    
+    /**
+   * 更新日期
+   */
+          @Excel(name = "更新日期", orderNum = "15")
+      private LocalDateTime updateTime;
+    
+  
+}

platform-dao/src/main/java/com/platform/dao/vo/export/ticket/ExportTicketExecuteVO.java

@@ -1,267 +0,0 @@
-package com.platform.dao.vo.export.ticket;
-
-import com.platform.office.annotation.Excel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票执行导出VO
- * @Author future
- * @Date 2020-07-21 14:54:12
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-public class ExportTicketExecuteVO implements Serializable {
-
-    /**
-   * id
-   */
-  @Excel(name = "id", orderNum = "1")
-  private String id;
-
-    /**
-   * 编号
-   */
-  @Excel(name = "编号", orderNum = "2")
-  private String no;
-
-    /**
-   * 工作票类别
-   */
-  @Excel(name = "工作票类别", orderNum = "3")
-  private String type;
-
-    /**
-   * 工作负责人
-   */
-  @Excel(name = "工作负责人", orderNum = "4")
-  private String chargeUserId;
-
-    /**
-   * 工作班人员
-   */
-  @Excel(name = "工作班人员", orderNum = "5")
-  private String workBanUserId;
-
-    /**
-   * 工作站变电站名称
-   */
-  @Excel(name = "工作站变电站名称", orderNum = "6")
-  private String stationName;
-
-    /**
-   * 工作任务
-   */
-  @Excel(name = "工作任务", orderNum = "7")
-  private String content;
-
-    /**
-   * 计划工作开始时间
-   */
-  @Excel(name = "计划工作开始时间", orderNum = "8")
-  private LocalDateTime planStartTime;
-
-    /**
-   * 计划工作结束时间
-   */
-  @Excel(name = "计划工作结束时间", orderNum = "9")
-  private LocalDateTime planEndTime;
-
-    /**
-   * 签发人签名
-   */
-  @Excel(name = "签发人签名", orderNum = "10")
-  private String signUserId;
-
-    /**
-   * 签发日期
-   */
-  @Excel(name = "签发日期", orderNum = "11")
-  private LocalDateTime signDateTime;
-
-    /**
-   * 收到工作票时间
-   */
-  @Excel(name = "收到工作票时间", orderNum = "12")
-  private LocalDateTime receiveDateTime;
-
-    /**
-   * 运行值班人员签名
-   */
-  @Excel(name = "运行值班人员签名", orderNum = "13")
-  private String zhibaoUserId;
-
-    /**
-   * 工作负责人签名
-   */
-  @Excel(name = "工作负责人签名", orderNum = "14")
-  private String signChargeUserId;
-
-    /**
-   * 确认工作票时间
-   */
-  @Excel(name = "确认工作票时间", orderNum = "15")
-  private LocalDateTime sureDateTime;
-
-    /**
-   * 工作负责人确认内容签名
-   */
-  @Excel(name = "工作负责人确认内容签名", orderNum = "16")
-  private String sureChargeUserId;
-
-    /**
-   * 工作许可人确认内容签名
-   */
-  @Excel(name = "工作许可人确认内容签名", orderNum = "17")
-  private String sureXukeUserId;
-
-    /**
-   * 许可开始工作时间
-   */
-  @Excel(name = "许可开始工作时间", orderNum = "18")
-  private LocalDateTime xuekeStartDateTime;
-
-    /**
-   * 确认工作任务和安全措施签名
-   */
-  @Excel(name = "确认工作任务和安全措施签名", orderNum = "19")
-  private String sureContentSignUserId;
-
-    /**
-   * 原工作负责人
-   */
-  @Excel(name = "原工作负责人", orderNum = "20")
-  private String oldChargeUserId;
-
-    /**
-   * 工作负责人变动时间
-   */
-  @Excel(name = "工作负责人变动时间", orderNum = "21")
-  private LocalDateTime changeDateTime;
-
-    /**
-   * 工作负责人变动签名
-   */
-  @Excel(name = "工作负责人变动签名", orderNum = "22")
-  private String changeSignUserId;
-
-    /**
-   * 工作人员变动情况1
-   */
-  @Excel(name = "工作人员变动情况1", orderNum = "23")
-  private String workUserChangeSituation;
-
-    /**
-   * 工作人员变动情况2
-   */
-  @Excel(name = "工作人员变动情况2", orderNum = "24")
-  private String workUserChangeSituationTwo;
-
-    /**
-   * 工作人员变动情况时间1
-   */
-  @Excel(name = "工作人员变动情况时间1", orderNum = "25")
-  private LocalDateTime workUserChangeSituationTime;
-
-    /**
-   * 工作人员变动情况时间2
-   */
-  @Excel(name = "工作人员变动情况时间2", orderNum = "26")
-  private LocalDateTime workUserChangeSituationTimeTwo;
-
-    /**
-   * 工作人员变动签名
-   */
-  @Excel(name = "工作人员变动签名", orderNum = "27")
-  private String workUserChangeSituationSignUserId;
-
-    /**
-   * 工作票延期截止时间
-   */
-  @Excel(name = "工作票延期截止时间", orderNum = "28")
-  private LocalDateTime yqEndDateTime;
-
-    /**
-   * 工作票延期工作负责人签名
-   */
-  @Excel(name = "工作票延期工作负责人签名", orderNum = "29")
-  private String yqChargeSignUserId;
-
-    /**
-   * 工作票延期工作许可人签名
-   */
-  @Excel(name = "工作票延期工作许可人签名", orderNum = "30")
-  private String yqXukeSignUserId;
-
-    /**
-   * 工作终结时间
-   */
-  @Excel(name = "工作终结时间", orderNum = "31")
-  private LocalDateTime workFinishDateTime;
-
-    /**
-   * 工作终结负责人签名
-   */
-  @Excel(name = "工作终结负责人签名", orderNum = "32")
-  private String workFinishChargeUserId;
-
-    /**
-   * 工作终结许可人签名
-   */
-  @Excel(name = "工作终结许可人签名", orderNum = "33")
-  private String workFinishXukeUserId;
-
-    /**
-   * 工作票终结时间
-   */
-  @Excel(name = "工作票终结时间", orderNum = "34")
-  private LocalDateTime ticketFinishDateTime;
-
-    /**
-   * 工作票终结许可人签名
-   */
-  @Excel(name = "工作票终结许可人签名", orderNum = "35")
-  private String ticketFinishXukeUserId;
-
-    /**
-   * 工作票终结备注
-   */
-  @Excel(name = "工作票终结备注", orderNum = "36")
-  private LocalDateTime ticketFinishRemark;
-
-    /**
-   * 状态0：已废弃1：执行中2：已退票3：工作已终结4：工作票已终结
-   */
-  @Excel(name = "状态0：已废弃1：执行中2：已退票3：工作已终结4：工作票已终结", orderNum = "37")
-  private Integer status;
-
-    /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "38")
-  private String remark1;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "39")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "40")
-  private LocalDateTime updateTime;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "41")
-  private String createdUserId;
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/export/ticket/ExportTicketSafeExecuteVO.java

@@ -1,93 +0,0 @@
-package com.platform.dao.vo.export.ticket;
-
-import com.platform.office.annotation.Excel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票安措执行导出VO
- * @Author future
- * @Date 2020-07-21 15:05:29
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-public class ExportTicketSafeExecuteVO implements Serializable {
-
-    /**
-   * id
-   */
-  @Excel(name = "id", orderNum = "1")
-  private String id;
-
-    /**
-   * 所属工作票执行单
-   */
-  @Excel(name = "所属工作票执行单", orderNum = "2")
-  private String ticketExcuteId;
-
-    /**
-   * 安措类别
-   */
-  @Excel(name = "安措类别", orderNum = "3")
-  private String type;
-
-    /**
-   * 安措名称
-   */
-  @Excel(name = "安措名称", orderNum = "4")
-  private String name;
-
-    /**
-   * 安措内容
-   */
-  @Excel(name = "安措内容", orderNum = "5")
-  private String content;
-
-    /**
-   * 危险等级
-   */
-  @Excel(name = "危险等级", orderNum = "6")
-  private Integer dangerLevel;
-
-    /**
-   * 来源1：签发单2：现场补充
-   */
-  @Excel(name = "来源1：签发单2：现场补充", orderNum = "7")
-  private Integer source;
-
-    /**
-   * 状态1：待执行2：已执行3：已废弃
-   */
-  @Excel(name = "状态1：待执行2：已执行3：已废弃", orderNum = "8")
-  private Integer status;
-
-    /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "9")
-  private String remark;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "10")
-  private String createdUserId;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "11")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "12")
-  private LocalDateTime updateTime;
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/export/ticket/ExportTicketSafeVO.java

@@ -1,87 +0,0 @@
-package com.platform.dao.vo.export.ticket;
-
-import com.platform.office.annotation.Excel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票安措导出VO
- * @Author future
- * @Date 2020-07-21 14:53:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-public class ExportTicketSafeVO implements Serializable {
-
-    /**
-   * id
-   */
-  @Excel(name = "id", orderNum = "1")
-  private String id;
-
-    /**
-   * 所属工作票
-   */
-  @Excel(name = "所属工作票", orderNum = "2")
-  private String ticketId;
-
-    /**
-   * 安全类别
-   */
-  @Excel(name = "安全类别", orderNum = "3")
-  private String type;
-
-    /**
-   * 安措名称
-   */
-  @Excel(name = "安措名称", orderNum = "4")
-  private String name;
-
-    /**
-   * 安措内容
-   */
-  @Excel(name = "安措内容", orderNum = "5")
-  private String content;
-
-    /**
-   * 危险等级
-   */
-  @Excel(name = "危险等级", orderNum = "6")
-  private Integer dangerLevel;
-
-    /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "7")
-  private String remark;
-
-    /**
-   * 状态0：已废弃 1：启用中
-   */
-  @Excel(name = "状态0：已废弃 1：启用中", orderNum = "8")
-  private Integer status;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "9")
-  private String createdUserId;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "10")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "11")
-  private LocalDateTime updateTime;
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/export/ticket/ExportTicketVO.java

@@ -1,75 +0,0 @@
-package com.platform.dao.vo.export.ticket;
-
-import com.platform.office.annotation.Excel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 两票工作票标准票导出VO
- * @Author future
- * @Date 2020-07-21 14:52:21
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-public class ExportTicketVO implements Serializable {
-
-    /**
-   * id
-   */
-  @Excel(name = "id", orderNum = "1")
-  private String id;
-
-    /**
-   * 编号
-   */
-  @Excel(name = "编号", orderNum = "2")
-  private String no;
-
-    /**
-   * 工作票类别
-   */
-  @Excel(name = "工作票类别", orderNum = "3")
-  private String type;
-
-    /**
-   * 工作任务
-   */
-  @Excel(name = "工作任务", orderNum = "4")
-  private String content;
-
-    /**
-   * 状态0：已废弃1：启用中
-   */
-  @Excel(name = "状态0：已废弃1：启用中", orderNum = "5")
-  private Integer status;
-
-    /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "6")
-  private String remark;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "7")
-  private String createdUserId;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "8")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "9")
-  private LocalDateTime updateTime;
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/query/activiti/ActivitiUserModelVO.java

@@ -55,6 +55,17 @@ public class ActivitiUserModelVO extends BaseVO implements Serializable {
      * 指定角色
      */
     private String roleId;
+
+    /**
+     * 指定部门:指定部门下面的角色的时候，需要设置roleId,
+     * 指定部门下面的某些角色的时候，需要设置roleList
+     * 指定发起人部门角色的时候，deptId,不需要设置，流程启动的时候，会自己找到发起人部门的deptId
+     */
+    private String deptId;
+    /**
+     * 指定角色多个["1","2"]
+     */
+    private String roleIdList;
     /**
      * 指定角色名称
      */

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbScrapFormVO.java

@@ -0,0 +1,112 @@
+package com.platform.dao.vo.query.sb;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 设备报废单VO结果类
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class SbScrapFormVO extends BaseVO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 入库单号
+     */
+    private String no;
+    /**
+     * 设备Id
+     */
+    private String sbId;
+    /**
+     * 设备Id -名称
+     */
+    private String sbName;
+    /**
+     * 设备编号
+     */
+    private String sbNo;
+    /**
+     * 设备编号
+     */
+    private String sbGgxh;
+    /**
+     * 设备原值/购置价值
+     */
+    private Double initialValue;
+    /**
+     * 当前价值
+     */
+    private Double currentValue;
+    /**
+     * 投用日期
+     */
+    private LocalDate startDate;
+    private Double workYear;// 预计工作年限(年为单位)
+    /**
+     * 报废原因
+     */
+    private String reason;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态
+     */
+    private Integer status;
+    /**
+     * 申请人
+     */
+    private String applyUserId;
+    /**
+     * 申请人名称
+     */
+    private String applyUserName;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 实例ID
+     */
+    private String processInstanceId;
+
+}

platform-dao/src/main/java/com/platform/dao/vo/query/ticket/TicketExecuteVO.java

@@ -1,192 +0,0 @@
-package com.platform.dao.vo.query.ticket;
-
-import lombok.Data;
-import com.platform.common.bean.BaseVO;
-import com.platform.common.bean.BaseDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票执行VO结果类
- * @Author future
- * @Date 2020-07-21 14:54:12
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketExecuteVO extends BaseVO implements Serializable{
-
-    /**
-     * id
-     */
-private String id;
-    /**
-     * 编号
-     */
-private String no;
-    /**
-     * 工作票类别
-     */
-private String type;
-    /**
-     * 工作负责人
-     */
-private String chargeUserId;
-    /**
-     * 工作班人员
-     */
-private String workBanUserId;
-    /**
-     * 工作站变电站名称
-     */
-private String stationName;
-    /**
-     * 工作任务
-     */
-private String content;
-    /**
-     * 计划工作开始时间
-     */
-private LocalDateTime planStartTime;
-    /**
-     * 计划工作结束时间
-     */
-private LocalDateTime planEndTime;
-    /**
-     * 签发人签名
-     */
-private String signUserId;
-    /**
-     * 签发日期
-     */
-private LocalDateTime signDateTime;
-    /**
-     * 收到工作票时间
-     */
-private LocalDateTime receiveDateTime;
-    /**
-     * 运行值班人员签名
-     */
-private String zhibaoUserId;
-    /**
-     * 工作负责人签名
-     */
-private String signChargeUserId;
-    /**
-     * 确认工作票时间
-     */
-private LocalDateTime sureDateTime;
-    /**
-     * 工作负责人确认内容签名
-     */
-private String sureChargeUserId;
-    /**
-     * 工作许可人确认内容签名
-     */
-private String sureXukeUserId;
-    /**
-     * 许可开始工作时间
-     */
-private LocalDateTime xuekeStartDateTime;
-    /**
-     * 确认工作任务和安全措施签名
-     */
-private String sureContentSignUserId;
-    /**
-     * 原工作负责人
-     */
-private String oldChargeUserId;
-    /**
-     * 工作负责人变动时间
-     */
-private LocalDateTime changeDateTime;
-    /**
-     * 工作负责人变动签名
-     */
-private String changeSignUserId;
-    /**
-     * 工作人员变动情况1
-     */
-private String workUserChangeSituation;
-    /**
-     * 工作人员变动情况2
-     */
-private String workUserChangeSituationTwo;
-    /**
-     * 工作人员变动情况时间1
-     */
-private LocalDateTime workUserChangeSituationTime;
-    /**
-     * 工作人员变动情况时间2
-     */
-private LocalDateTime workUserChangeSituationTimeTwo;
-    /**
-     * 工作人员变动签名
-     */
-private String workUserChangeSituationSignUserId;
-    /**
-     * 工作票延期截止时间
-     */
-private LocalDateTime yqEndDateTime;
-    /**
-     * 工作票延期工作负责人签名
-     */
-private String yqChargeSignUserId;
-    /**
-     * 工作票延期工作许可人签名
-     */
-private String yqXukeSignUserId;
-    /**
-     * 工作终结时间
-     */
-private LocalDateTime workFinishDateTime;
-    /**
-     * 工作终结负责人签名
-     */
-private String workFinishChargeUserId;
-    /**
-     * 工作终结许可人签名
-     */
-private String workFinishXukeUserId;
-    /**
-     * 工作票终结时间
-     */
-private LocalDateTime ticketFinishDateTime;
-    /**
-     * 工作票终结许可人签名
-     */
-private String ticketFinishXukeUserId;
-    /**
-     * 工作票终结备注
-     */
-private LocalDateTime ticketFinishRemark;
-    /**
-     * 状态0：已废弃1：执行中2：已退票3：工作已终结4：工作票已终结
-     */
-private Integer status;
-    /**
-     * 备注
-     */
-private String remark1;
-    /**
-     * 创建日期
-     */
-private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-private LocalDateTime updateTime;
-    /**
-     * 创建人
-     */
-private String createdUserId;
-
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/query/ticket/TicketSafeExecuteVO.java

@@ -1,76 +0,0 @@
-package com.platform.dao.vo.query.ticket;
-
-import lombok.Data;
-import com.platform.common.bean.BaseVO;
-import com.platform.common.bean.BaseDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票安措执行VO结果类
- * @Author future
- * @Date 2020-07-21 15:05:29
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketSafeExecuteVO extends BaseVO implements Serializable{
-
-    /**
-     * id
-     */
-private String id;
-    /**
-     * 所属工作票执行单
-     */
-private String ticketExcuteId;
-    /**
-     * 安措类别
-     */
-private String type;
-    /**
-     * 安措名称
-     */
-private String name;
-    /**
-     * 安措内容
-     */
-private String content;
-    /**
-     * 危险等级
-     */
-private Integer dangerLevel;
-    /**
-     * 来源1：签发单2：现场补充
-     */
-private Integer source;
-    /**
-     * 状态1：待执行2：已执行3：已废弃
-     */
-private Integer status;
-    /**
-     * 备注
-     */
-private String remark;
-    /**
-     * 创建人
-     */
-private String createdUserId;
-    /**
-     * 创建日期
-     */
-private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-private LocalDateTime updateTime;
-
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/query/ticket/TicketSafeVO.java

@@ -1,72 +0,0 @@
-package com.platform.dao.vo.query.ticket;
-
-import lombok.Data;
-import com.platform.common.bean.BaseVO;
-import com.platform.common.bean.BaseDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 工作票安措VO结果类
- * @Author future
- * @Date 2020-07-21 14:53:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketSafeVO extends BaseVO implements Serializable{
-
-    /**
-     * id
-     */
-private String id;
-    /**
-     * 所属工作票
-     */
-private String ticketId;
-    /**
-     * 安全类别
-     */
-private String type;
-    /**
-     * 安措名称
-     */
-private String name;
-    /**
-     * 安措内容
-     */
-private String content;
-    /**
-     * 危险等级
-     */
-private Integer dangerLevel;
-    /**
-     * 备注
-     */
-private String remark;
-    /**
-     * 状态0：已废弃 1：启用中
-     */
-private Integer status;
-    /**
-     * 创建人
-     */
-private String createdUserId;
-    /**
-     * 创建日期
-     */
-private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-private LocalDateTime updateTime;
-
-
-
-}

platform-dao/src/main/java/com/platform/dao/vo/query/ticket/TicketVO.java

@@ -1,64 +0,0 @@
-package com.platform.dao.vo.query.ticket;
-
-import lombok.Data;
-import com.platform.common.bean.BaseVO;
-import com.platform.common.bean.BaseDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-
-/**
- * @Description 两票工作票标准票VO结果类
- * @Author future
- * @Date 2020-07-21 14:52:21
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-public class TicketVO extends BaseVO implements Serializable{
-
-    /**
-     * id
-     */
-private String id;
-    /**
-     * 编号
-     */
-private String no;
-    /**
-     * 工作票类别
-     */
-private String type;
-    /**
-     * 工作任务
-     */
-private String content;
-    /**
-     * 状态0：已废弃1：启用中
-     */
-private Integer status;
-    /**
-     * 备注
-     */
-private String remark;
-    /**
-     * 创建人
-     */
-private String createdUserId;
-    /**
-     * 创建日期
-     */
-private LocalDateTime createdTime;
-    /**
-     * 更新日期
-     */
-private LocalDateTime updateTime;
-
-
-
-}

platform-dao/src/main/resources/mapper/activiti/ActivitiUserModelMapper.xml

@@ -8,6 +8,9 @@
                                      userModel.name,
                                      userModel.type,
                                      userModel.assignee,
+                                     userModel.role_id,
+                                     userModel.dept_id,
+                                     userModel.role_id_list,
                                      userModel.candidate_users,
                                      userModel.candidate_groups,
                                      userModel.form_variable,
@@ -25,6 +28,9 @@
                                      userModel.name,
                                      userModel.type,
                                      userModel.assignee,
+                                     userModel.role_id,
+                                     userModel.dept_id,
+                                     userModel.role_id_list,
                                      userModel.candidate_users,
                                      userModel.candidate_groups,
                                      userModel.form_variable,
@@ -49,6 +55,12 @@
         <if test="assignee != null and assignee != ''">
             and userModel.assignee = #{assignee}
         </if>
+        <if test="roleId != null and roleId != ''">
+            and userModel.role_id = #{roleId}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and userModel.dept_id = #{deptId}
+        </if>
         <if test="formVariable != null and formVariable != ''">
             and userModel.form_variable = #{formVariable}
         </if>

platform-dao/src/main/resources/mapper/sb/SbScrapFormMapper.xml

@@ -0,0 +1,114 @@
+<?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.platform.dao.mapper.sb.SbScrapFormMapper">
+    <sql id="Base_Column_List">
+        scraps
+        .
+        id
+        ,
+                                     scraps.no,
+                                     scraps.sb_id,
+                                     scraps.sb_no,
+                                     scraps.reason,
+                                     scraps.remark,
+                                     scraps.status,
+                                     scraps.apply_user_id,
+                                     scraps.apply_user_name,
+                                     scraps.created_user_id,
+                                     scraps.created_user_name,
+                                     scraps.update_user_id,
+                                     scraps.update_user_name,
+                                     scraps.created_time,
+scraps.process_instance_id,
+                                     scraps.update_time
+    </sql>
+    <sql id="Ref_Column_List">
+        scraps
+        .
+        no
+        ,
+                                     scraps.sb_id,
+                                     scraps.sb_no,
+                                     scraps.reason,
+                                     scraps.remark,
+                                     scraps.status,
+                                     scraps.apply_user_id,
+scraps.process_instance_id,
+                                     scraps.apply_user_name,
+    </sql>
+    <sql id="List_Condition">
+        <if test="id != null and id != ''">
+            and scraps.id = #{id}
+        </if>
+        <if test="no != null and no != ''">
+            and scraps.no = #{no}
+        </if>
+        <if test="sbId != null">
+            and scraps.sb_id = #{sbId}
+        </if>
+        <if test="processInstanceId != null">
+            and scraps.process_instance_id = #{processInstanceId}
+        </if>
+        <if test="sbNo != null and sbNo != ''">
+            and scraps.sb_no = #{sbNo}
+        </if>
+        <if test="reason != null and reason != ''">
+            and scraps.reason = #{reason}
+        </if>
+        <if test="remark != null and remark != ''">
+            and scraps.remark = #{remark}
+        </if>
+        <if test="status != null">
+            and scraps.status = #{status}
+        </if>
+        <if test="applyUserId != null and applyUserId != ''">
+            and scraps.apply_user_id = #{applyUserId}
+        </if>
+        <if test="applyUserName != null and applyUserName != ''">
+            and scraps.apply_user_name = #{applyUserName}
+        </if>
+        <if test="createdUserId != null and createdUserId != ''">
+            and scraps.created_user_id = #{createdUserId}
+        </if>
+        <if test="createdUserName != null and createdUserName != ''">
+            and scraps.created_user_name = #{createdUserName}
+        </if>
+        <if test="updateUserId != null and updateUserId != ''">
+            and scraps.update_user_id = #{updateUserId}
+        </if>
+        <if test="updateUserName != null and updateUserName != ''">
+            and scraps.update_user_name = #{updateUserName}
+        </if>
+        <if test="createdTimeStart != null">
+            and scraps.created_time <![CDATA[>=]]>; #{createdTimeStart}
+        </if>
+        <if test="createdTimeEnd != null">
+            and scraps.created_time <![CDATA[<=]]> #{createdTimeEnd}
+        </if>
+        <if test="createdTime != null">
+            and scraps.created_time = #{createdTime}
+        </if>
+        <if test="updateTimeStart != null">
+            and scraps.update_time <![CDATA[>=]]>; #{updateTimeStart}
+        </if>
+        <if test="updateTimeEnd != null">
+            and scraps.update_time <![CDATA[<=]]> #{updateTimeEnd}
+        </if>
+        <if test="updateTime != null">
+            and scraps.update_time = #{updateTime}
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and t1.name like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.sb.SbScrapFormDTO"
+            resultType="com.platform.dao.vo.query.sb.SbScrapFormVO">
+        select scraps.*
+        ,t1.name as sbName, t1.no as sbNo, t1.ggxh as sbGgxh,t1.initial_value, t1.current_value, t1.start_date, t1.work_year
+        from t_sb_scrap_form as scraps
+        join t_sb_info t1 on scraps.sb_id = t1.id
+        <where>
+            <include refid="List_Condition"/>
+        </where>
+    </select>
+</mapper>

platform-dao/src/main/resources/mapper/ticket/TicketExecuteMapper.xml

@@ -1,221 +0,0 @@
-<?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.platform.dao.mapper.ticket.TicketExecuteMapper">
-    <sql id="Base_Column_List">
-                             ticketexecute.id,
-                                     ticketexecute.no,
-                                     ticketexecute.type,
-                                     ticketexecute.charge_user_id,
-                                     ticketexecute.work_ban_user_id,
-                                     ticketexecute.remark,
-                                     ticketexecute.content,
-                                     ticketexecute.plan_start_time,
-                                     ticketexecute.plan_end_time,
-                                     ticketexecute.sign_user_id,
-                                     ticketexecute.sign_date_time,
-                                     ticketexecute.receive_date_time,
-                                     ticketexecute.zhibao_user_id,
-                                     ticketexecute.sign_charge_user_id,
-                                     ticketexecute.sure_date_time,
-                                     ticketexecute.sure_charge_user_id,
-                                     ticketexecute.sure_xuke_user_id,
-                                     ticketexecute.xueke_start_date_time,
-                                     ticketexecute.sure_content_sign_user_id,
-                                     ticketexecute.old_charge_user_id,
-                                     ticketexecute.change_date_time,
-                                     ticketexecute.change_sign_user_id,
-                                     ticketexecute.work_user_change_situation,
-                                     ticketexecute.work_user_change_situation_two,
-                                     ticketexecute.work_user_change_situation_time,
-                                     ticketexecute.work_user_change_situation_time_two,
-                                     ticketexecute.work_user_change_situation_sign_user_id,
-                                     ticketexecute.yq_end_date_time,
-                                     ticketexecute.yq_charge_sign_user_id,
-                                     ticketexecute.yq_xuke_sign_user_id,
-                                     ticketexecute.work_finish_date_time,
-                                     ticketexecute.work_finish_charge_user_id,
-                                     ticketexecute.work_finish_xuke_user_id,
-                                     ticketexecute.ticket_finish_date_time,
-                                     ticketexecute.ticket_finish_xuke_user_id,
-                                     ticketexecute.ticket_finish_remark,
-                                     ticketexecute.remark,
-                                     ticketexecute.status,
-                                     ticketexecute.created_time,
-                                     ticketexecute.update_time,
-                                     ticketexecute.created_user_id
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         ticketexecute.no,
-                                     ticketexecute.type,
-                                     ticketexecute.charge_user_id,
-                                     ticketexecute.work_ban_user_id,
-                                     ticketexecute.remark,
-                                     ticketexecute.content,
-                                     ticketexecute.plan_start_time,
-                                     ticketexecute.plan_end_time,
-                                     ticketexecute.sign_user_id,
-                                     ticketexecute.sign_date_time,
-                                     ticketexecute.receive_date_time,
-                                     ticketexecute.zhibao_user_id,
-                                     ticketexecute.sign_charge_user_id,
-                                     ticketexecute.sure_date_time,
-                                     ticketexecute.sure_charge_user_id,
-                                     ticketexecute.sure_xuke_user_id,
-                                     ticketexecute.xueke_start_date_time,
-                                     ticketexecute.sure_content_sign_user_id,
-                                     ticketexecute.old_charge_user_id,
-                                     ticketexecute.change_date_time,
-                                     ticketexecute.change_sign_user_id,
-                                     ticketexecute.work_user_change_situation,
-                                     ticketexecute.work_user_change_situation_two,
-                                     ticketexecute.work_user_change_situation_time,
-                                     ticketexecute.work_user_change_situation_time_two,
-                                     ticketexecute.work_user_change_situation_sign_user_id,
-                                     ticketexecute.yq_end_date_time,
-                                     ticketexecute.yq_charge_sign_user_id,
-                                     ticketexecute.yq_xuke_sign_user_id,
-                                     ticketexecute.work_finish_date_time,
-                                     ticketexecute.work_finish_charge_user_id,
-                                     ticketexecute.work_finish_xuke_user_id,
-                                     ticketexecute.ticket_finish_date_time,
-                                     ticketexecute.ticket_finish_xuke_user_id,
-                                     ticketexecute.ticket_finish_remark,
-                                     ticketexecute.remark,
-                                     ticketexecute.status,
-                                                                                                                                                            </sql>
-    <sql id="List_Condition">
-                                    <if test="id != null and id != ''">
-                    and ticketexecute.id = #{id}
-                </if>
-                                                <if test="no != null and no != ''">
-                    and ticketexecute.no = #{no}
-                </if>
-                                                <if test="type != null and type != ''">
-                    and ticketexecute.type = #{type}
-                </if>
-                                                <if test="chargeUserId != null and chargeUserId != ''">
-                    and ticketexecute.charge_user_id = #{chargeUserId}
-                </if>
-                                                <if test="workBanUserId != null and workBanUserId != ''">
-                    and ticketexecute.work_ban_user_id = #{workBanUserId}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and ticketexecute.remark = #{remark}
-                </if>
-                                                <if test="content != null and content != ''">
-                    and ticketexecute.content = #{content}
-                </if>
-                                                <if test="planStartTime != null">
-                    and ticketexecute.plan_start_time = #{planStartTime}
-                </if>
-                                                <if test="planEndTime != null">
-                    and ticketexecute.plan_end_time = #{planEndTime}
-                </if>
-                                                <if test="signUserId != null and signUserId != ''">
-                    and ticketexecute.sign_user_id = #{signUserId}
-                </if>
-                                                <if test="signDateTime != null">
-                    and ticketexecute.sign_date_time = #{signDateTime}
-                </if>
-                                                <if test="receiveDateTime != null">
-                    and ticketexecute.receive_date_time = #{receiveDateTime}
-                </if>
-                                                <if test="zhibaoUserId != null and zhibaoUserId != ''">
-                    and ticketexecute.zhibao_user_id = #{zhibaoUserId}
-                </if>
-                                                <if test="signChargeUserId != null and signChargeUserId != ''">
-                    and ticketexecute.sign_charge_user_id = #{signChargeUserId}
-                </if>
-                                                <if test="sureDateTime != null">
-                    and ticketexecute.sure_date_time = #{sureDateTime}
-                </if>
-                                                <if test="sureChargeUserId != null and sureChargeUserId != ''">
-                    and ticketexecute.sure_charge_user_id = #{sureChargeUserId}
-                </if>
-                                                <if test="sureXukeUserId != null and sureXukeUserId != ''">
-                    and ticketexecute.sure_xuke_user_id = #{sureXukeUserId}
-                </if>
-                                                <if test="xuekeStartDateTime != null">
-                    and ticketexecute.xueke_start_date_time = #{xuekeStartDateTime}
-                </if>
-                                                <if test="sureContentSignUserId != null and sureContentSignUserId != ''">
-                    and ticketexecute.sure_content_sign_user_id = #{sureContentSignUserId}
-                </if>
-                                                <if test="oldChargeUserId != null and oldChargeUserId != ''">
-                    and ticketexecute.old_charge_user_id = #{oldChargeUserId}
-                </if>
-                                                <if test="changeDateTime != null">
-                    and ticketexecute.change_date_time = #{changeDateTime}
-                </if>
-                                                <if test="changeSignUserId != null and changeSignUserId != ''">
-                    and ticketexecute.change_sign_user_id = #{changeSignUserId}
-                </if>
-                                                <if test="workUserChangeSituation != null and workUserChangeSituation != ''">
-                    and ticketexecute.work_user_change_situation = #{workUserChangeSituation}
-                </if>
-                                                <if test="workUserChangeSituationTwo != null and workUserChangeSituationTwo != ''">
-                    and ticketexecute.work_user_change_situation_two = #{workUserChangeSituationTwo}
-                </if>
-                                                <if test="workUserChangeSituationTime != null">
-                    and ticketexecute.work_user_change_situation_time = #{workUserChangeSituationTime}
-                </if>
-                                                <if test="workUserChangeSituationTimeTwo != null">
-                    and ticketexecute.work_user_change_situation_time_two = #{workUserChangeSituationTimeTwo}
-                </if>
-                                                <if test="workUserChangeSituationSignUserId != null and workUserChangeSituationSignUserId != ''">
-                    and ticketexecute.work_user_change_situation_sign_user_id = #{workUserChangeSituationSignUserId}
-                </if>
-                                                <if test="yqEndDateTime != null">
-                    and ticketexecute.yq_end_date_time = #{yqEndDateTime}
-                </if>
-                                                <if test="yqChargeSignUserId != null and yqChargeSignUserId != ''">
-                    and ticketexecute.yq_charge_sign_user_id = #{yqChargeSignUserId}
-                </if>
-                                                <if test="yqXukeSignUserId != null and yqXukeSignUserId != ''">
-                    and ticketexecute.yq_xuke_sign_user_id = #{yqXukeSignUserId}
-                </if>
-                                                <if test="workFinishDateTime != null">
-                    and ticketexecute.work_finish_date_time = #{workFinishDateTime}
-                </if>
-                                                <if test="workFinishChargeUserId != null and workFinishChargeUserId != ''">
-                    and ticketexecute.work_finish_charge_user_id = #{workFinishChargeUserId}
-                </if>
-                                                <if test="workFinishXukeUserId != null and workFinishXukeUserId != ''">
-                    and ticketexecute.work_finish_xuke_user_id = #{workFinishXukeUserId}
-                </if>
-                                                <if test="ticketFinishDateTime != null">
-                    and ticketexecute.ticket_finish_date_time = #{ticketFinishDateTime}
-                </if>
-                                                <if test="ticketFinishXukeUserId != null and ticketFinishXukeUserId != ''">
-                    and ticketexecute.ticket_finish_xuke_user_id = #{ticketFinishXukeUserId}
-                </if>
-                                                <if test="ticketFinishRemark != null">
-                    and ticketexecute.ticket_finish_remark = #{ticketFinishRemark}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and ticketexecute.remark = #{remark}
-                </if>
-                                                <if test="status != null">
-                    and ticketexecute.status = #{status}
-                </if>
-                                                <if test="createdTime != null">
-                    and ticketexecute.created_time = #{createdTime}
-                </if>
-                                                <if test="updateTime != null">
-                    and ticketexecute.update_time = #{updateTime}
-                </if>
-                                                <if test="createdUserId != null and createdUserId != ''">
-                    and ticketexecute.created_user_id = #{createdUserId}
-                </if>
-                            <if test="keyword != null and keyword != ''">
-            and ticketexecute.id like concat(concat('%',#{keyword}),'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.ticket.TicketExecuteDTO" resultType="com.platform.dao.vo.query.ticket.TicketExecuteVO">
-        select ticketexecute.*
-        from t_ticket_execute as ticketexecute
-        <where>
-            <include refid="List_Condition" />
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/ticket/TicketMapper.xml

@@ -1,61 +0,0 @@
-<?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.platform.dao.mapper.ticket.TicketMapper">
-    <sql id="Base_Column_List">
-                             ticket.id,
-                                     ticket.no,
-                                     ticket.type,
-                                     ticket.content,
-                                     ticket.remark,
-                                     ticket.created_user_id,
-                                     ticket.created_time,
-                                     ticket.update_time,
-                                     ticket.status
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         ticket.no,
-                                     ticket.type,
-                                     ticket.content,
-                                     ticket.remark,
-                                                                                                                                                                         ticket.status
-                                </sql>
-    <sql id="List_Condition">
-                                    <if test="id != null and id != ''">
-                    and ticket.id = #{id}
-                </if>
-                                                <if test="no != null and no != ''">
-                    and ticket.no = #{no}
-                </if>
-                                                <if test="type != null and type != ''">
-                    and ticket.type = #{type}
-                </if>
-                                                <if test="content != null and content != ''">
-                    and ticket.content = #{content}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and ticket.remark = #{remark}
-                </if>
-                                                <if test="createdUserId != null and createdUserId != ''">
-                    and ticket.created_user_id = #{createdUserId}
-                </if>
-                                                <if test="createdTime != null">
-                    and ticket.created_time = #{createdTime}
-                </if>
-                                                <if test="updateTime != null">
-                    and ticket.update_time = #{updateTime}
-                </if>
-                                                <if test="status != null">
-                    and ticket.status = #{status}
-                </if>
-                            <if test="keyword != null and keyword != ''">
-            and ticket.id like concat(concat('%',#{keyword}),'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.ticket.TicketDTO" resultType="com.platform.dao.vo.query.ticket.TicketVO">
-        select ticket.*
-        from t_ticket as ticket
-        <where>
-            <include refid="List_Condition" />
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/ticket/TicketSafeExecuteMapper.xml

@@ -1,76 +0,0 @@
-<?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.platform.dao.mapper.ticket.TicketSafeExecuteMapper">
-    <sql id="Base_Column_List">
-                             ticketsaveexecute.id,
-                                     ticketsaveexecute.ticket_excute_id,
-                                     ticketsaveexecute.type,
-                                     ticketsaveexecute.name,
-                                     ticketsaveexecute.content,
-                                     ticketsaveexecute.danger_level,
-                                     ticketsaveexecute.source,
-                                     ticketsaveexecute.status,
-                                     ticketsaveexecute.remark,
-                                     ticketsaveexecute.created_user_id,
-                                     ticketsaveexecute.created_time,
-                                     ticketsaveexecute.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         ticketsaveexecute.ticket_excute_id,
-                                     ticketsaveexecute.type,
-                                     ticketsaveexecute.name,
-                                     ticketsaveexecute.content,
-                                     ticketsaveexecute.danger_level,
-                                     ticketsaveexecute.source,
-                                     ticketsaveexecute.status,
-                                     ticketsaveexecute.remark,
-                                                                                                                                                            </sql>
-    <sql id="List_Condition">
-                                    <if test="id != null and id != ''">
-                    and ticketsaveexecute.id = #{id}
-                </if>
-                                                <if test="ticketExcuteId != null and ticketExcuteId != ''">
-                    and ticketsaveexecute.ticket_excute_id = #{ticketExcuteId}
-                </if>
-                                                <if test="type != null and type != ''">
-                    and ticketsaveexecute.type = #{type}
-                </if>
-                                                <if test="name != null and name != ''">
-                    and ticketsaveexecute.name = #{name}
-                </if>
-                                                <if test="content != null and content != ''">
-                    and ticketsaveexecute.content = #{content}
-                </if>
-                                                <if test="dangerLevel != null">
-                    and ticketsaveexecute.danger_level = #{dangerLevel}
-                </if>
-                                                <if test="source != null">
-                    and ticketsaveexecute.source = #{source}
-                </if>
-                                                <if test="status != null">
-                    and ticketsaveexecute.status = #{status}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and ticketsaveexecute.remark = #{remark}
-                </if>
-                                                <if test="createdUserId != null and createdUserId != ''">
-                    and ticketsaveexecute.created_user_id = #{createdUserId}
-                </if>
-                                                <if test="createdTime != null">
-                    and ticketsaveexecute.created_time = #{createdTime}
-                </if>
-                                                <if test="updateTime != null">
-                    and ticketsaveexecute.update_time = #{updateTime}
-                </if>
-                            <if test="keyword != null and keyword != ''">
-            and ticketsaveexecute.id like concat(concat('%',#{keyword}),'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.ticket.TicketSafeExecuteDTO" resultType="com.platform.dao.vo.query.ticket.TicketSafeExecuteVO">
-        select ticketsaveexecute.*
-        from t_ticket_safe_execute as ticketsaveexecute
-        <where>
-            <include refid="List_Condition" />
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/ticket/TicketSafeMapper.xml

@@ -1,71 +0,0 @@
-<?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.platform.dao.mapper.ticket.TicketSafeMapper">
-    <sql id="Base_Column_List">
-                             ticketsave.id,
-                                     ticketsave.ticket_id,
-                                     ticketsave.type,
-                                     ticketsave.name,
-                                     ticketsave.content,
-                                     ticketsave.danger_level,
-                                     ticketsave.remark,
-                                     ticketsave.status,
-                                     ticketsave.created_user_id,
-                                     ticketsave.created_time,
-                                     ticketsave.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         ticketsave.ticket_id,
-                                     ticketsave.type,
-                                     ticketsave.name,
-                                     ticketsave.content,
-                                     ticketsave.danger_level,
-                                     ticketsave.remark,
-                                     ticketsave.status,
-                                                                                                                                                            </sql>
-    <sql id="List_Condition">
-                                    <if test="id != null and id != ''">
-                    and ticketsave.id = #{id}
-                </if>
-                                                <if test="ticketId != null and ticketId != ''">
-                    and ticketsave.ticket_id = #{ticketId}
-                </if>
-                                                <if test="type != null and type != ''">
-                    and ticketsave.type = #{type}
-                </if>
-                                                <if test="name != null and name != ''">
-                    and ticketsave.name = #{name}
-                </if>
-                                                <if test="content != null and content != ''">
-                    and ticketsave.content = #{content}
-                </if>
-                                                <if test="dangerLevel != null">
-                    and ticketsave.danger_level = #{dangerLevel}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and ticketsave.remark = #{remark}
-                </if>
-                                                <if test="status != null">
-                    and ticketsave.status = #{status}
-                </if>
-                                                <if test="createdUserId != null and createdUserId != ''">
-                    and ticketsave.created_user_id = #{createdUserId}
-                </if>
-                                                <if test="createdTime != null">
-                    and ticketsave.created_time = #{createdTime}
-                </if>
-                                                <if test="updateTime != null">
-                    and ticketsave.update_time = #{updateTime}
-                </if>
-                            <if test="keyword != null and keyword != ''">
-            and ticketsave.id like concat(concat('%',#{keyword}),'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.ticket.TicketSafeDTO" resultType="com.platform.dao.vo.query.ticket.TicketSafeVO">
-        select ticketsave.*
-        from t_ticket_safe as ticketsave
-        <where>
-            <include refid="List_Condition" />
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkJobMapper.xml

@@ -1,173 +0,0 @@
-<?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.platform.dao.mapper.work.WorkJobMapper">
-    <sql id="Base_Column_List">
-                             checkjob.id,
-                                     checkjob.plan_id,
-                                     checkjob.start_time,
-                                     checkjob.end_time,
-                                     checkjob.actual_start_time,
-                                     checkjob.actual_end_time,
-                                     checkjob.status,
-                                     checkjob.sb_status,
-                                     checkjob.created_user_id,
-                                     checkjob.update_user_id,
-                                     checkjob.created_user_name,
-                                     checkjob.update_user_name,
-                                     checkjob.created_time,
-                                     checkjob.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         checkjob.plan_id,
-                                     checkjob.start_time,
-                                     checkjob.end_time,
-                                     checkjob.actual_start_time,
-                                     checkjob.actual_end_time,
-                                     checkjob.checked_num,
-                                     checkjob.abnormal_num,
-                                     checkjob.check_num,
-                                     checkjob.status,
-                                     checkjob.sb_status,
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and checkjob.id = #{id}
-        </if>
-        <if test="planId != null and planId != ''">
-            and checkjob.plan_id = #{planId}
-        </if>
-        <if test="sbId != null and sbId != ''">
-            and checkjob.sb_id = #{sbId}
-        </if>
-        <if test="partId != null and partId != ''">
-            and checkjob.part_id = #{partId}
-        </if>
-        <if test="standardId != null and standardId != ''">
-            and checkjob.standard_id = #{standardId}
-        </if>
-        <if test="requirement != null and requirement != ''">
-            and checkjob.requirement = #{requirement}
-        </if>
-        <if test="remark != null and remark != ''">
-            and checkjob.remark = #{remark}
-        </if>
-        <if test="feedback != null and feedback != ''">
-            and checkjob.feedback = #{feedback}
-        </if>
-        <if test="startTimeStart != null">
-            and checkjob.start_time <![CDATA[>=]]>; #{startTimeStart}
-        </if>
-        <if test="startTimeEnd != null">
-            and checkjob.start_time <![CDATA[<=]]> #{startTimeEnd}
-        </if>
-        <if test="startTime != null">
-            and checkjob.start_time = #{startTime}
-        </if>
-        <if test="endTimeStart != null">
-            and checkjob.end_time <![CDATA[>=]]>; #{endTimeStart}
-        </if>
-        <if test="endTimeEnd != null">
-            and checkjob.end_time <![CDATA[<=]]> #{endTimeEnd}
-        </if>
-        <if test="endTime != null">
-            and checkjob.end_time = #{endTime}
-        </if>
-        <if test="actualStartTimeStart != null">
-            and checkjob.actual_start_time <![CDATA[>=]]>; #{actualStartTimeStart}
-        </if>
-        <if test="actualStartTimeEnd != null">
-            and checkjob.actual_start_time <![CDATA[<=]]> #{actualStartTimeEnd}
-        </if>
-        <if test="actualStartTime != null">
-            and checkjob.actual_start_time = #{actualStartTime}
-        </if>
-        <if test="actualEndTimeStart != null">
-            and checkjob.actual_end_time <![CDATA[>=]]>; #{actualEndTimeStart}
-        </if>
-        <if test="actualEndTimeEnd != null">
-            and checkjob.actual_end_time <![CDATA[<=]]> #{actualEndTimeEnd}
-        </if>
-        <if test="actualEndTime != null">
-            and checkjob.actual_end_time = #{actualEndTime}
-        </if>
-        <if test="status != null">
-            and checkjob.status = #{status}
-        </if>
-        <if test="sbStatus != null">
-            and checkjob.sb_status = #{sbStatus}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and checkjob.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and checkjob.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and checkjob.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and checkjob.update_user_name = #{updateUserName}
-        </if>
-        <if test="createdTimeStart != null">
-            and checkjob.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and checkjob.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and checkjob.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and checkjob.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and checkjob.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and checkjob.update_time = #{updateTime}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and checkjob.id like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select checkjob.*, plan.name planName, plan.no planNo,sbinfo.name sbName, partinfo.name partName,standard.name standardName
-        from t_work_job as checkjob
-        left join t_work_plan plan on checkjob.plan_id = plan.id
-        left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
-        left join t_part_info partinfo on partinfo.id = checkjob.part_id
-        left join t_work_standard standard on standard.id = checkjob.standard_id
-        <where>
-            <include refid="List_Condition"/>
-            <if test="planName != null and planName != ''">
-                and plan.name = #{planName}
-            </if>
-            <if test="checkUserId != null and checkUserId != ''">
-
-            </if>
-            <if test="type != null and type != ''">
-                and plan.type = #{type}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectDetail" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select checkjob.*, plan.name planName, plan.no planNo,sbinfo.name sbName, partinfo.name partName,standard.name standardName
-        from t_work_job as checkjob
-        left join t_work_plan plan on checkjob.plan_id = plan.id
-        left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
-        left join t_part_info partinfo on partinfo.id = checkjob.part_id
-        left join t_work_standard standard on standard.id = checkjob.standard_id
-        where checkjob.id = #{id}
-    </select>
-
-    <select id="selectJobList" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select plan.id planId,plan.check_user_id,plan.check_user_name, standard.id standardId, standard.name standardName,standard.remark,standard.requirement,project.sb_id, project.part_id from t_work_plan plan
-        left join t_work_project_plan_relation pprelation on pprelation.plan_id = plan.id
-        left join t_work_project project on project.id = pprelation.project_id
-        left join t_work_project_standard_relation cpsreladtion on cpsreladtion.project_id = project.id
-        left join t_work_standard standard on standard.id = cpsreladtion.standard_id
-        where plan.id = #{planId}
-
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkPlanMapper.xml

@@ -1,166 +0,0 @@
-<?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.platform.dao.mapper.work.WorkPlanMapper">
-    <sql id="Base_Column_List">
-                             checkplan.id,
-                                     checkplan.no,
-                                     checkplan.name,
-                                     checkplan.check_user_id,
-                                     checkplan.check_user_name,
-                                     checkplan.period,
-                                     checkplan.type,
-                                     checkplan.period_type,
-                                     checkplan.valid_time,
-                                     checkplan.valid_time_type,
-                                     checkplan.start_time,
-                                     checkplan.end_time,
-                                     checkplan.last_generated_time,
-                                     checkplan.enable,
-                                     checkplan.remark,
-                                     checkplan.created_user_id,
-                                     checkplan.update_user_id,
-                                     checkplan.created_user_name,
-                                     checkplan.update_user_name,
-                                     checkplan.created_time,
-                                     checkplan.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         checkplan.no,
-                                     checkplan.name,
-                                     checkplan.check_user_id,
-                                     checkplan.check_user_name,
-                                     checkplan.period,
-                                     checkplan.type,
-                                     checkplan.period_type,
-                                     checkplan.valid_time,
-                                     checkplan.valid_time_type,
-                                     checkplan.start_time,
-                                     checkplan.end_time,
-                                     checkplan.last_generated_time,
-                                     checkplan.enable,
-                                     checkplan.remark,
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and checkplan.id = #{id}
-        </if>
-        <if test="no != null and no != ''">
-            and checkplan.no = #{no}
-        </if>
-        <if test="name != null and name != ''">
-            and checkplan.name = #{name}
-        </if>
-        <if test="checkUserId != null and checkUserId != ''">
-            and checkplan.check_user_id = #{checkUserId}
-        </if>
-        <if test="checkUserName != null and checkUserName != ''">
-            and checkplan.check_user_name = #{checkUserName}
-        </if>
-        <if test="period != null">
-            and checkplan.period = #{period}
-        </if>
-        <if test="type != null">
-            and checkplan.type = #{type}
-        </if>
-        <if test="periodType != null">
-            and checkplan.period_type = #{periodType}
-        </if>
-        <if test="validTime != null">
-            and checkplan.valid_time = #{validTime}
-        </if>
-        <if test="validTimeType != null">
-            and checkplan.valid_time_type = #{validTimeType}
-        </if>
-        <if test="startTimeStart != null">
-            and checkplan.start_time <![CDATA[>=]]>; #{startTimeStart}
-        </if>
-        <if test="startTimeEnd != null">
-            and checkplan.start_time <![CDATA[<=]]> #{startTimeEnd}
-        </if>
-        <if test="startTime != null">
-            and checkplan.start_time = #{startTime}
-        </if>
-        <if test="endTimeStart != null">
-            and checkplan.end_time <![CDATA[>=]]>; #{endTimeStart}
-        </if>
-        <if test="endTimeEnd != null">
-            and checkplan.end_time <![CDATA[<=]]> #{endTimeEnd}
-        </if>
-        <if test="currentDate != null">
-            and checkplan.start_time <![CDATA[<=]]> #{currentDate}
-            and checkplan.end_time <![CDATA[>=]]> #{currentDate}
-        </if>
-        <if test="endTime != null">
-            and checkplan.end_time = #{endTime}
-        </if>
-        <if test="lastGeneratedTimeStart != null">
-            and checkplan.last_generated_time <![CDATA[>=]]>; #{lastGeneratedTimeStart}
-        </if>
-        <if test="lastGeneratedTimeEnd != null">
-            and checkplan.last_generated_time <![CDATA[<=]]> #{lastGeneratedTimeEnd}
-        </if>
-        <if test="lastGeneratedTime != null">
-            and checkplan.last_generated_time = #{lastGeneratedTime}
-        </if>
-        <if test="enable != null">
-            and checkplan.enable = #{enable}
-        </if>
-        <if test="remark != null and remark != ''">
-            and checkplan.remark = #{remark}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and checkplan.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and checkplan.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and checkplan.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and checkplan.update_user_name = #{updateUserName}
-        </if>
-        <if test="createdTimeStart != null">
-            and checkplan.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and checkplan.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and checkplan.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and checkplan.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and checkplan.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and checkplan.update_time = #{updateTime}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and checkplan.id like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckPlanDTO" resultType="com.platform.dao.vo.query.check.CheckPlanVO">
-        select checkplan.*
-        from t_work_plan as checkplan
-        <where>
-            <include refid="List_Condition"/>
-        </where>
-    </select>
-
-    <select id="selectPlanProjectList" resultType="com.platform.dao.vo.query.check.CheckProjectVO">
-        select project.*, sbinfo.name sbName,sbinfo.no sbNo,partinfo.no partName,partinfo.no partNo,standard.name standardName,standard.no standardNo,
-        sbType.name sbType
-        from t_work_project_plan_relation tcppr
-        inner join t_work_plan plan on tcppr.plan_id = plan.id
-        inner join t_work_project project on tcppr.project_id  = project.id
-        left join t_sb_info sbinfo on project.sb_id = sbinfo.id
-        left join t_part_info partinfo on project.part_id = partinfo.id
-        left join t_work_project_standard_relation cpsrelation on cpsrelation.project_id = project.id
-        left join t_work_standard standard on standard.id = cpsrelation.standard_id
-        left join t_sb_type sbType on sbinfo.type_id = sbType.id
-        where tcppr.plan_id = #{planId}
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkPlanStandardRelationMapper.xml

@@ -1,5 +0,0 @@
-<?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.platform.dao.mapper.work.WorkPlanStandardRelationMapper">
-
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkProjectMapper.xml

@@ -1,117 +0,0 @@
-<?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.platform.dao.mapper.work.WorkProjectMapper">
-    <sql id="Base_Column_List">
-                             checkproject.id,
-                                     checkproject.no,
-                                     checkproject.sb_id,
-                                     checkproject.part_id,
-                                     checkproject.standard_id,
-                                     checkproject.enable,
-                                     checkproject.created_user_id,
-                                     checkproject.update_user_id,
-                                     checkproject.created_user_name,
-                                     checkproject.update_user_name,
-                                     checkproject.created_time,
-                                     checkproject.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         checkproject.no,
-                                     checkproject.sb_id,
-                                     checkproject.part_id,
-                                     checkproject.standard_id,
-                                     checkproject.enable,
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and checkproject.id = #{id}
-        </if>
-        <if test="no != null and no != ''">
-            and checkproject.no = #{no}
-        </if>
-        <if test="sbId != null and sbId != ''">
-            and checkproject.sb_id = #{sbId}
-        </if>
-        <if test="partId != null and partId != ''">
-            and checkproject.part_id = #{partId}
-        </if>
-        <if test="standardId != null and standardId != ''">
-            and checkproject.standard_id = #{standardId}
-        </if>
-        <if test="enable != null">
-            and checkproject.enable = #{enable}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and checkproject.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and checkproject.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and checkproject.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and checkproject.update_user_name = #{updateUserName}
-        </if>
-        <if test="createdTimeStart != null">
-            and checkproject.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and checkproject.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and checkproject.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and checkproject.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and checkproject.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and checkproject.update_time = #{updateTime}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and checkproject.id like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckProjectDTO" resultType="com.platform.dao.vo.query.check.CheckProjectVO">
-        SELECT DISTINCT
-        checkproject.*,
-        sbinfo.NAME sbName,
-        sbinfo.NO sbNo,
-        partinfo.NAME partName,
-        partinfo.NO partNo
-        FROM
-        t_work_project AS checkproject
-        LEFT JOIN t_sb_info sbinfo ON checkproject.sb_id = sbinfo.id
-        LEFT JOIN t_part_info partinfo ON checkproject.part_id = partinfo.id
-        <where>
-            <include refid="List_Condition"/>
-            <if test="sbName != null and sbName != ''">
-                and sbinfo.name like concat(concat('%',#{sbName}),'%')
-            </if>
-
-            <if test="type != null and type != ''">
-                and checkproject.type = #{type}
-            </if>
-        </where>
-    </select>
-    <select id="selectDetail" resultType="com.platform.dao.vo.query.check.CheckProjectVO">
-        select checkproject.*,sbinfo.name sbName,sbinfo.no sbNo,partinfo.name partName, partinfo.no partNo, sbType.name sbType,guige.name sbGuigeName
-        from t_work_project as checkproject
-        left join t_sb_info sbinfo on checkproject.sb_id = sbinfo.id
-        left join t_part_info partinfo on checkproject.part_id = partinfo.id
-        left join t_sb_type sbType on sbinfo.type_id = sbType.id
-        left join t_sb_guige guige on guige.id = sbinfo.guige_id
-        where checkproject.id = #{id}
-    </select>
-    <select id="selectStandardList" resultType="com.platform.dao.vo.query.check.CheckStandardVO">
-        select standard.*,sbType.name sbType from t_work_standard standard
-        left join t_work_project_standard_relation tcpsr on tcpsr.standard_id=standard.id
-        left join t_work_project checkproject on checkproject.id = tcpsr.project_id
-        left join t_sb_info sbinfo on checkproject.sb_id = sbinfo.id
-        left join t_sb_type sbType on sbinfo.type_id = sbType.id
-        where tcpsr.project_id = #{id} and standard.enable=1
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkProjectPlanRelationMapper.xml

@@ -1,71 +0,0 @@
-<?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.platform.dao.mapper.work.WorkProjectPlanRelationMapper">
-    <sql id="Base_Column_List">
-                             checkprojectplanrelation.id,
-                                     checkprojectplanrelation.plan_id,
-                                     checkprojectplanrelation.project_id,
-                                     checkprojectplanrelation.created_user_id,
-                                     checkprojectplanrelation.update_user_id,
-                                     checkprojectplanrelation.created_user_name,
-                                     checkprojectplanrelation.update_user_name,
-                                     checkprojectplanrelation.created_time,
-                                     checkprojectplanrelation.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         checkprojectplanrelation.plan_id,
-                                     checkprojectplanrelation.project_id,
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and checkprojectplanrelation.id = #{id}
-        </if>
-        <if test="planId != null and planId != ''">
-            and checkprojectplanrelation.plan_id = #{planId}
-        </if>
-        <if test="projectId != null and projectId != ''">
-            and checkprojectplanrelation.project_id = #{projectId}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and checkprojectplanrelation.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and checkprojectplanrelation.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and checkprojectplanrelation.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and checkprojectplanrelation.update_user_name = #{updateUserName}
-        </if>
-        <if test="createdTimeStart != null">
-            and checkprojectplanrelation.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and checkprojectplanrelation.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and checkprojectplanrelation.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and checkprojectplanrelation.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and checkprojectplanrelation.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and checkprojectplanrelation.update_time = #{updateTime}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and checkprojectplanrelation.id like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckProjectPlanRelationDTO"
-            resultType="com.platform.dao.entity.work.WorkProjectPlanRelation">
-        select checkprojectplanrelation.*
-        from t_work_project_plan_relation as checkprojectplanrelation
-        <where>
-            <include refid="List_Condition"/>
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkProjectStandardRelationMapper.xml

@@ -1,71 +0,0 @@
-<?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.platform.dao.mapper.work.WorkProjectStandardRelationMapper">
-    <sql id="Base_Column_List">
-                             projectstandardrelation.id,
-                                     projectstandardrelation.project_id,
-                                     projectstandardrelation.standard_id,
-                                     projectstandardrelation.created_time,
-                                     projectstandardrelation.update_time,
-                                     projectstandardrelation.created_user_id,
-                                     projectstandardrelation.update_user_id,
-                                     projectstandardrelation.created_user_name,
-                                     projectstandardrelation.update_user_name
-                        </sql>
-    <sql id="Ref_Column_List">
-                                     projectstandardrelation.project_id,
-                                     projectstandardrelation.standard_id
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and projectstandardrelation.id = #{id}
-        </if>
-        <if test="projectId != null and projectId != ''">
-            and projectstandardrelation.project_id = #{projectId}
-        </if>
-        <if test="standardId != null and standardId != ''">
-            and projectstandardrelation.standard_id = #{standardId}
-        </if>
-        <if test="createdTimeStart != null">
-            and projectstandardrelation.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and projectstandardrelation.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and projectstandardrelation.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and projectstandardrelation.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and projectstandardrelation.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and projectstandardrelation.update_time = #{updateTime}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and projectstandardrelation.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and projectstandardrelation.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and projectstandardrelation.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and projectstandardrelation.update_user_name = #{updateUserName}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and projectstandardrelation.id like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckProjectStandardRelationDTO"
-            resultType="com.platform.dao.vo.query.check.CheckProjectStandardRelationVO">
-        select projectstandardrelation.*
-        from t_work_project_standard_relation as projectstandardrelation
-        <where>
-            <include refid="List_Condition"/>
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkStandardMapper.xml

@@ -1,90 +0,0 @@
-<?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.platform.dao.mapper.work.WorkStandardMapper">
-    <sql id="Base_Column_List">
-                                    checkstandard.id,
-                                     checkstandard.name,
-                                     checkstandard.no,
-                                     checkstandard.type,
-                                     checkstandard.enable,
-                                     checkstandard.requirement,
-                                     checkstandard.remark,
-                                     checkstandard.created_user_id,
-                                     checkstandard.update_user_id,
-                                     checkstandard.created_user_name,
-                                     checkstandard.update_user_name,
-                                     checkstandard.created_time,
-                                     checkstandard.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                     checkstandard.name,
-                                     checkstandard.no,
-                                     checkstandard.type,
-                                     checkstandard.enable,
-                                     checkstandard.requirement,
-                                     checkstandard.remark,
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and checkstandard.id = #{id}
-        </if>
-        <if test="name != null and name != ''">
-            and checkstandard.name = #{name}
-        </if>
-        <if test="no != null and no != ''">
-            and checkstandard.no = #{no}
-        </if>
-        <if test="type != null">
-            and checkstandard.type = #{type}
-        </if>
-        <if test="enable != null">
-            and checkstandard.enable = #{enable}
-        </if>
-        <if test="requirement != null and requirement != ''">
-            and checkstandard.requirement = #{requirement}
-        </if>
-        <if test="remark != null and remark != ''">
-            and checkstandard.remark = #{remark}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and checkstandard.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and checkstandard.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and checkstandard.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and checkstandard.update_user_name = #{updateUserName}
-        </if>
-        <if test="createdTimeStart != null">
-            and checkstandard.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and checkstandard.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and checkstandard.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and checkstandard.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and checkstandard.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and checkstandard.update_time = #{updateTime}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and checkstandard.name like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardDTO" resultType="com.platform.dao.entity.work.WorkStandard">
-        select checkstandard.*
-        from t_work_standard as checkstandard
-        <where>
-            <include refid="List_Condition"/>
-        </where>
-    </select>
-</mapper>

platform-dao/src/main/resources/mapper/work/WorkStandardParamMapper.xml

@@ -1,118 +0,0 @@
-<?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.platform.dao.mapper.work.WorkStandardParamMapper">
-    <resultMap id="BaseResultMap" type="com.platform.dao.entity.work.WorkStandardParam">
-        <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="standard_id" jdbcType="VARCHAR" property="standardId"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="type" jdbcType="INTEGER" property="type"/>
-        <result column="upper_limit" jdbcType="VARCHAR" property="upperLimit"/>
-        <result column="lowerr_limit" jdbcType="VARCHAR" property="lowerrLimit"/>
-        <result column="reference_value" jdbcType="VARCHAR" property="referenceValue"/>
-        <result column="normal_selection" jdbcType="VARCHAR" property="normalSelection"/>
-        <result column="instruction" jdbcType="VARCHAR" property="instruction"/>
-        <result column="created_user_id" jdbcType="VARCHAR" property="createdUserId"/>
-        <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
-        <result column="created_user_name" jdbcType="VARCHAR" property="createdUserName"/>
-        <result column="update_user_name" jdbcType="VARCHAR" property="updateUserName"/>
-        <result column="created_time" jdbcType="TIMESTAMP" property="createdTime"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-                             checkstandardparam.id,
-                                     checkstandardparam.standard_id,
-                                     checkstandardparam.name,
-                                     checkstandardparam.type,
-                                     checkstandardparam.upper_limit,
-                                     checkstandardparam.lowerr_limit,
-                                     checkstandardparam.reference_value,
-                                     checkstandardparam.normal_selection,
-                                     checkstandardparam.instruction,
-                                     checkstandardparam.created_user_id,
-                                     checkstandardparam.update_user_id,
-                                     checkstandardparam.created_user_name,
-                                     checkstandardparam.update_user_name,
-                                     checkstandardparam.created_time,
-                                     checkstandardparam.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-                                                                         checkstandardparam.standard_id,
-                                     checkstandardparam.name,
-                                     checkstandardparam.type,
-                                     checkstandardparam.upper_limit,
-                                     checkstandardparam.lowerr_limit,
-                                     checkstandardparam.reference_value,
-                                     checkstandardparam.normal_selection,
-                                     checkstandardparam.instruction,
-                                                                                                                                                                                                                                                                                                </sql>
-    <sql id="List_Condition">
-        <if test="id != null and id != ''">
-            and checkstandardparam.id = #{id}
-        </if>
-        <if test="standardId != null and standardId != ''">
-            and checkstandardparam.standard_id = #{standardId}
-        </if>
-        <if test="name != null and name != ''">
-            and checkstandardparam.name = #{name}
-        </if>
-        <if test="type != null">
-            and checkstandardparam.type = #{type}
-        </if>
-        <if test="upperLimit != null and upperLimit != ''">
-            and checkstandardparam.upper_limit = #{upperLimit}
-        </if>
-        <if test="lowerrLimit != null and lowerrLimit != ''">
-            and checkstandardparam.lowerr_limit = #{lowerrLimit}
-        </if>
-        <if test="referenceValue != null and referenceValue != ''">
-            and checkstandardparam.reference_value = #{referenceValue}
-        </if>
-        <if test="normalSelection != null and normalSelection != ''">
-            and checkstandardparam.normal_selection = #{normalSelection}
-        </if>
-        <if test="instruction != null and instruction != ''">
-            and checkstandardparam.instruction = #{instruction}
-        </if>
-        <if test="createdUserId != null and createdUserId != ''">
-            and checkstandardparam.created_user_id = #{createdUserId}
-        </if>
-        <if test="updateUserId != null and updateUserId != ''">
-            and checkstandardparam.update_user_id = #{updateUserId}
-        </if>
-        <if test="createdUserName != null and createdUserName != ''">
-            and checkstandardparam.created_user_name = #{createdUserName}
-        </if>
-        <if test="updateUserName != null and updateUserName != ''">
-            and checkstandardparam.update_user_name = #{updateUserName}
-        </if>
-        <if test="createdTimeStart != null">
-            and checkstandardparam.created_time <![CDATA[>=]]>; #{createdTimeStart}
-        </if>
-        <if test="createdTimeEnd != null">
-            and checkstandardparam.created_time <![CDATA[<=]]> #{createdTimeEnd}
-        </if>
-        <if test="createdTime != null">
-            and checkstandardparam.created_time = #{createdTime}
-        </if>
-        <if test="updateTimeStart != null">
-            and checkstandardparam.update_time <![CDATA[>=]]>; #{updateTimeStart}
-        </if>
-        <if test="updateTimeEnd != null">
-            and checkstandardparam.update_time <![CDATA[<=]]> #{updateTimeEnd}
-        </if>
-        <if test="updateTime != null">
-            and checkstandardparam.update_time = #{updateTime}
-        </if>
-        <if test="keyword != null and keyword != ''">
-            and checkstandardparam.id like concat('%',#{keyword},'%')
-        </if>
-    </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardParamDTO"
-            resultType="com.platform.dao.entity.work.WorkStandardParam">
-        select checkstandardparam.*
-        from t_work_standard_param as checkstandardparam
-        <where>
-            <include refid="List_Condition"/>
-        </where>
-    </select>
-</mapper>

platform-rest/src/main/java/com/platform/rest/controller/activiti/ActivitiUserModelController.java

@@ -86,14 +86,14 @@ public class ActivitiUserModelController {
      * 修改审批流程xml文件
      *
      * @param modelId 主键
-     * @param list 审批节点
+     * @param list    审批节点
      * @return R
      */
     @SysLog("修改审批流程xml文件")
     @PutMapping("/model/modify/{modelId}")
     @PreAuthorize("@pms.hasPermission('activiti-user-models-edit')")
     public R getByModelId(@PathVariable("modelId") String modelId, @RequestBody List<ActivitiUserModel> list) {
-        activitiUserModelService.modify(modelId, list);
+        activitiUserModelService.modify(modelId, null, list);
         return new R("设置成功");
     }
 

platform-rest/src/main/java/com/platform/rest/controller/activiti/SbInfoActivitiController.java

@@ -1,146 +0,0 @@
-package com.platform.rest.controller.activiti;
-
-import com.platform.activiti.bean.ActivitiTaskDetail;
-import com.platform.activiti.dao.entity.ActApplyInfo;
-import com.platform.activiti.dao.entity.ActAuditRecord;
-import com.platform.activiti.enums.ActApplyEnum;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.constant.CommonConstants;
-import com.platform.common.enums.ResultCode;
-import com.platform.common.exception.BusinessException;
-import com.platform.common.model.UserInfo;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.util.DateUtils;
-import com.platform.common.util.R;
-import com.platform.common.util.SecurityUtils;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import com.platform.dao.dto.sb.SbInfoDTO;
-import com.platform.dao.entity.sb.SbInfo;
-import com.platform.dao.entity.upms.SysUser;
-import com.platform.dao.enums.SbInfoStatusEnum;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.util.TreeUtil;
-import com.platform.dao.vo.export.sb.ExportSbInfoMeasureVO;
-import com.platform.dao.vo.export.sb.ExportSbInfoVO;
-import com.platform.dao.vo.sb.SbInfoVO;
-import com.platform.dao.vo.sb.SbInfoWorkplaceVO;
-import com.platform.office.poi.excel.ExcelImportUtil;
-import com.platform.office.poi.excel.entity.ImportParams;
-import com.platform.rest.log.annotation.SysLog;
-import com.platform.service.business.SbInfoActivitiBusinessService;
-import com.platform.service.sb.SbInfoService;
-import com.platform.service.upms.SysUserService;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.IdentityService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
-import org.activiti.engine.history.HistoricProcessInstance;
-import org.activiti.engine.history.HistoricTaskInstance;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.task.Comment;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.time.LocalDateTime;
-import java.util.*;
-
-/**
- * @Description 设备基础信息 控制器
- * @Author liuyu
- * @Date 2020-04-21 21:05:46
- * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
- */
-@Slf4j
-@RestController
-@AllArgsConstructor
-@RequestMapping("/activiti/sb")
-public class SbInfoActivitiController {
-
-    private final SbInfoService sbInfoService;
-    private final SbInfoActivitiBusinessService sbInfoActivitiBusinessService;
-
-    /**
-     * 启动：将设备id和表单id设置到businessKey中
-     * @param sbInfoDTO 设备基础信息DTO
-     * @return R
-     */
-    @SysLog("设备报废提交审批")
-    @PutMapping("/start")
-    public R start(@RequestBody SbInfoDTO sbInfoDTO) {
-        ProcessInstance instance = sbInfoActivitiBusinessService.start(sbInfoDTO);
-        SbInfo sbInfo = new SbInfo();
-        sbInfo.setStatus(SbInfoStatusEnum.IN_SCRAP.getValue());
-        sbInfo.setId(sbInfoDTO.getId());
-        sbInfo.setProcessInstanceId(instance.getId());
-        sbInfoService.updateByPrimaryKeySelective(sbInfo);
-        return new R<>("设备报废申请已提交");
-    }
-
-    /**
-     * 审核
-     *
-     * @param sbInfoDTO:不包括processInstanceId，
-     * @return R
-     */
-    @SysLog("设备报废审核")
-    @PutMapping("/audit")
-    public R audit(@RequestBody SbInfoDTO sbInfoDTO) {
-        boolean flag = sbInfoActivitiBusinessService.audit(sbInfoDTO);
-        if(sbInfoActivitiBusinessService.checkFinish(sbInfoDTO.getProcessInstanceId())){
-            SbInfo sbInfo = new SbInfo();
-            sbInfo.setStatus(flag?SbInfoStatusEnum.SCRAPED.getValue():SbInfoStatusEnum.REFUSE_SCRAPED.getValue());
-            sbInfo.setId(sbInfoDTO.getId());
-            sbInfoService.updateByPrimaryKeySelective(sbInfo);
-        }
-        return new R<>();
-    }
-
-    /**
-     * 审核
-     *
-     * @param sbInfoDTO
-     * @return R
-     */
-    @SysLog("设备报废终止审核")
-    @PutMapping("/stop")
-    public R stop(@RequestBody SbInfoDTO sbInfoDTO) {
-        sbInfoActivitiBusinessService.stop(sbInfoDTO);
-        return new R<>();
-    }
-
-    /**
-     * 转签
-     *
-     * @param sbInfoDTO
-     * @return R
-     */
-    @SysLog("设备报废转签")
-    @PutMapping("/assign")
-    public R assign(@RequestBody SbInfoDTO sbInfoDTO) {
-        sbInfoActivitiBusinessService.assign(sbInfoDTO);
-        return new R<>();
-    }
-
-    /**
-     * 审核历史
-     *
-     * @param processInstanceId
-     * @return R
-     */
-    @SysLog("设备报废审核历史")
-    @GetMapping("/history/{processInstanceId}")
-    public R history(@PathVariable("processInstanceId") String processInstanceId) {
-        return new R(sbInfoActivitiBusinessService.history(processInstanceId));
-    }
-
-}
-

platform-rest/src/main/java/com/platform/rest/controller/activiti/SbScrapActivitiController.java

@@ -0,0 +1,91 @@
+package com.platform.rest.controller.activiti;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.business.SbScrapActivitiBusinessService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description 设备基础信息 控制器
+ * @Author liuyu
+ * @Date 2020-04-21 21:05:46
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/activiti/sb/scrap")
+public class SbScrapActivitiController {
+
+    private final SbScrapActivitiBusinessService sbScrapActivitiBusinessService;
+
+    /**
+     * 启动：将设备id和表单id设置到businessKey中
+     * @param sbScrapDTO 设备基础信息DTO
+     * @return R
+     */
+    @SysLog("设备报废提交审批")
+    @PutMapping("/start")
+    public R start(@RequestBody SbScrapFormDTO sbScrapDTO) {
+        ProcessInstance instance = sbScrapActivitiBusinessService.start(sbScrapDTO);
+        return new R<>("设备报废申请已提交");
+    }
+
+    /**
+     * 审核
+     *
+     * @param sbScrapDTO:不包括processInstanceId，
+     * @return R
+     */
+    @SysLog("设备报废审核")
+    @PutMapping("/audit")
+    public R audit(@RequestBody SbScrapFormDTO sbScrapDTO) {
+        boolean flag = sbScrapActivitiBusinessService.audit(sbScrapDTO);
+
+        return new R<>();
+    }
+
+    /**
+     * 审核
+     *
+     * @param sbScrapDTO
+     * @return R
+     */
+    @SysLog("设备报废终止审核")
+    @PutMapping("/stop")
+    public R stop(@RequestBody SbScrapFormDTO sbScrapDTO) {
+        sbScrapActivitiBusinessService.stop(sbScrapDTO);
+        return new R<>();
+    }
+
+    /**
+     * 转签
+     *
+     * @param sbScrapDTO
+     * @return R
+     */
+    @SysLog("设备报废转签")
+    @PutMapping("/assign")
+    public R assign(@RequestBody SbScrapFormDTO sbScrapDTO) {
+        sbScrapActivitiBusinessService.assign(sbScrapDTO);
+        return new R<>();
+    }
+
+    /**
+     * 审核历史
+     *
+     * @param processInstanceId
+     * @return R
+     */
+    @SysLog("设备报废审核历史")
+    @GetMapping("/history/{processInstanceId}")
+    public R history(@PathVariable("processInstanceId") String processInstanceId) {
+        return new R(sbScrapActivitiBusinessService.history(processInstanceId));
+    }
+
+}
+

platform-rest/src/main/java/com/platform/rest/controller/sb/SbScrapFormController.java

@@ -0,0 +1,156 @@
+package com.platform.rest.controller.sb;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.dao.entity.sb.SbScrapForm;
+import com.platform.service.sb.SbScrapFormService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.sb.ExportSbScrapFormVO;
+import com.platform.dao.vo.query.sb.SbScrapFormVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 设备报废单 控制器
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sb/scraps")
+public class SbScrapFormController {
+
+    private final SbScrapFormService sbScrapFormService;
+
+    /**
+     * 通过id查询单条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R<SbScrapForm> getById(@PathVariable("id") String id) {
+        return new R<>(sbScrapFormService.getModelById(id));
+    }
+
+    /**
+     * 新增记录
+     *
+     * @param sbScrapFormDTO 设备报废单DTO
+     * @return R
+     */
+    @SysLog("新增设备报废单")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('sb-scraps-add')")
+    public R save(@Validated({AddGroup.class}) @RequestBody SbScrapFormDTO sbScrapFormDTO) {
+        return new R<>(sbScrapFormService.saveModelByDTO(sbScrapFormDTO));
+    }
+
+    /**
+     * 修改记录
+     *
+     * @param sbScrapFormDTO 设备报废单DTO
+     * @return R
+     */
+    @SysLog("修改设备报废单")
+    @PutMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-scraps-edit')")
+    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SbScrapFormDTO sbScrapFormDTO) {
+        sbScrapFormService.modModelByDTO(sbScrapFormDTO);
+        return new R<>();
+    }
+
+
+    /**
+     * 根据主键 修改select类型值
+     *
+     * @param id
+     * @param status
+     * @return R
+     */
+    @SysLog("修改设备报废单")
+    @PutMapping("/status/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-scraps-edit')")
+    public R updateStatusById(@PathVariable("id") String id, Integer status) {
+        sbScrapFormService.updateStatusById(id, status);
+        return new R<>();
+    }
+
+    /**
+     * 通过id删除一条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @SysLog("删除设备报废单")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-scraps-del')")
+    public R removeById(@PathVariable String id) {
+        sbScrapFormService.deleteByPrimaryKey(id);
+        return new R<>();
+    }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除设备报废单")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('sb-scraps-del')")
+    public R removeIds(@RequestBody List<String> ids) {
+        sbScrapFormService.batchDelete(ids);
+        return new R<>();
+    }
+
+    /**
+     * 获取分页
+     *
+     * @param pageNum        当前页码
+     * @param pageSize       每页条数
+     * @param sbScrapFormDTO 设备报废单DTO
+     * @return R
+     */
+    @GetMapping("/page")
+    public R<AbstractPageResultBean<SbScrapFormVO>> query(SbScrapFormDTO sbScrapFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(sbScrapFormService.selectPageList(sbScrapFormDTO, pageNum, pageSize));
+    }
+
+    /**
+     * 获取列表
+     *
+     * @param sbScrapFormDTO 设备报废单DTO
+     * @return R
+     */
+    @GetMapping("")
+    public R query(SbScrapFormDTO sbScrapFormDTO) {
+        return new R<>(sbScrapFormService.getModelListByDTO(sbScrapFormDTO));
+    }
+
+    /**
+     * 设备报废单导出
+     *
+     * @param sbScrapFormDTO 设备报废单DTO
+     * @return R
+     */
+    @GetMapping("/export")
+    @SysLog("设备报废单导出")
+    @PreAuthorize("@pms.hasPermission('sb-scraps-export')")
+    public void export(HttpServletResponse response, SbScrapFormDTO sbScrapFormDTO) {
+        List<SbScrapForm> list = sbScrapFormService.getModelListByDTO(sbScrapFormDTO);
+        ExcelUtil.exportResponseDict(response, ExportSbScrapFormVO.class, BeanConverterUtil.copyListProperties(list, ExportSbScrapFormVO.class), "设备报废单");
+    }
+
+}

platform-rest/src/main/java/com/platform/rest/controller/ticket/TicketController.java

@@ -1,139 +0,0 @@
-package com.platform.rest.controller.ticket;
-
-import com.platform.common.util.R;
-import com.platform.dao.dto.ticket.TicketDTO;
-import com.platform.dao.entity.ticket.Ticket;
-import com.platform.service.ticket.TicketService;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.ticket.ExportTicketVO;
-import com.platform.dao.vo.query.ticket.TicketVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import lombok.AllArgsConstructor;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.rest.log.annotation.SysLog;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Description 工作票标准票 控制器
- * @Author future
- * @Date 2020-07-21 10:43:10
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/ticket/tickets")
-public class TicketController {
-
-  private final  TicketService ticketService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<Ticket> getById(@PathVariable("id") String id){
-      return new R<>(ticketService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param ticketDTO 工作票标准票DTO
-   * @return R
-   */
-  @SysLog("新增工作票标准票")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('ticket-tickets-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody TicketDTO ticketDTO) {
-      return new R<>(ticketService.saveModelByDTO(ticketDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param ticketDTO 工作票标准票DTO
-   * @return R
-   */
-  @SysLog("修改工作票标准票")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-tickets-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody TicketDTO ticketDTO) {
-      ticketService.modModelByDTO(ticketDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除工作票标准票")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-tickets-del')")
-  public R removeById(@PathVariable String id){
-    ticketService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除工作票标准票")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('ticket-tickets-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        ticketService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param ticketDTO 工作票标准票DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<TicketVO>> query(TicketDTO ticketDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(ticketService.selectPageList(ticketDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param ticketDTO 工作票标准票DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(TicketDTO ticketDTO) {
-      return new R<>(ticketService.getModelListByDTO(ticketDTO));
-  }
-
-  /**
-     * 工作票标准票导出
-     *
-     * @param ticketDTO 工作票标准票DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("工作票标准票导出")
-  @PreAuthorize("@pms.hasPermission('ticket-tickets-export')")
-  public void export(HttpServletResponse response, TicketDTO ticketDTO) {
-    List<Ticket> list = ticketService.getModelListByDTO(ticketDTO);
-    ExcelUtil.exportResponseDict(response, ExportTicketVO.class, BeanConverterUtil.copyListProperties(list, ExportTicketVO.class), "工作票标准票");
-  }
-
-}

platform-rest/src/main/java/com/platform/rest/controller/ticket/TicketExecuteController.java

@@ -1,139 +0,0 @@
-package com.platform.rest.controller.ticket;
-
-import com.platform.common.util.R;
-import com.platform.dao.dto.ticket.TicketExecuteDTO;
-import com.platform.dao.entity.ticket.TicketExecute;
-import com.platform.service.ticket.TicketExecuteService;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.ticket.ExportTicketExecuteVO;
-import com.platform.dao.vo.query.ticket.TicketExecuteVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import lombok.AllArgsConstructor;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.rest.log.annotation.SysLog;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Description 两票工作票执行单 控制器
- * @Author future
- * @Date 2020-07-21 14:07:58
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/ticket/ticket-executes")
-public class TicketExecuteController {
-
-  private final  TicketExecuteService ticketExecuteService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<TicketExecute> getById(@PathVariable("id") String id){
-      return new R<>(ticketExecuteService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param ticketExecuteDTO 两票工作票执行单DTO
-   * @return R
-   */
-  @SysLog("新增两票工作票执行单")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-executes-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody TicketExecuteDTO ticketExecuteDTO) {
-      return new R<>(ticketExecuteService.saveModelByDTO(ticketExecuteDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param ticketExecuteDTO 两票工作票执行单DTO
-   * @return R
-   */
-  @SysLog("修改两票工作票执行单")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-executes-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody TicketExecuteDTO ticketExecuteDTO) {
-      ticketExecuteService.modModelByDTO(ticketExecuteDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除两票工作票执行单")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-executes-del')")
-  public R removeById(@PathVariable String id){
-    ticketExecuteService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除两票工作票执行单")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('ticket-ticket-executes-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        ticketExecuteService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param ticketExecuteDTO 两票工作票执行单DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<TicketExecuteVO>> query(TicketExecuteDTO ticketExecuteDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(ticketExecuteService.selectPageList(ticketExecuteDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param ticketExecuteDTO 两票工作票执行单DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(TicketExecuteDTO ticketExecuteDTO) {
-      return new R<>(ticketExecuteService.getModelListByDTO(ticketExecuteDTO));
-  }
-
-  /**
-     * 两票工作票执行单导出
-     *
-     * @param ticketExecuteDTO 两票工作票执行单DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("两票工作票执行单导出")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-executes-export')")
-  public void export(HttpServletResponse response, TicketExecuteDTO ticketExecuteDTO) {
-    List<TicketExecute> list = ticketExecuteService.getModelListByDTO(ticketExecuteDTO);
-    ExcelUtil.exportResponseDict(response, ExportTicketExecuteVO.class, BeanConverterUtil.copyListProperties(list, ExportTicketExecuteVO.class), "两票工作票执行单");
-  }
-
-}

platform-rest/src/main/java/com/platform/rest/controller/ticket/TicketSafeController.java

@@ -1,139 +0,0 @@
-package com.platform.rest.controller.ticket;
-
-import com.platform.common.util.R;
-import com.platform.dao.dto.ticket.TicketSafeDTO;
-import com.platform.dao.entity.ticket.TicketSafe;
-import com.platform.service.ticket.TicketSafeService;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.ticket.ExportTicketSafeVO;
-import com.platform.dao.vo.query.ticket.TicketSafeVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import lombok.AllArgsConstructor;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.rest.log.annotation.SysLog;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Description 两票安全措施 控制器
- * @Author future
- * @Date 2020-07-21 14:10:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/ticket/ticket-safes")
-public class TicketSafeController {
-
-  private final  TicketSafeService ticketSafeService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<TicketSafe> getById(@PathVariable("id") String id){
-      return new R<>(ticketSafeService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param ticketSafeDTO 两票安全措施DTO
-   * @return R
-   */
-  @SysLog("新增两票安全措施")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-saves-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody TicketSafeDTO ticketSafeDTO) {
-      return new R<>(ticketSafeService.saveModelByDTO(ticketSafeDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param ticketSafeDTO 两票安全措施DTO
-   * @return R
-   */
-  @SysLog("修改两票安全措施")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-saves-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody TicketSafeDTO ticketSafeDTO) {
-      ticketSafeService.modModelByDTO(ticketSafeDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除两票安全措施")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-saves-del')")
-  public R removeById(@PathVariable String id){
-    ticketSafeService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除两票安全措施")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('ticket-ticket-saves-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        ticketSafeService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param ticketSafeDTO 两票安全措施DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<TicketSafeVO>> query(TicketSafeDTO ticketSafeDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(ticketSafeService.selectPageList(ticketSafeDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param ticketSafeDTO 两票安全措施DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(TicketSafeDTO ticketSafeDTO) {
-      return new R<>(ticketSafeService.getModelListByDTO(ticketSafeDTO));
-  }
-
-  /**
-     * 两票安全措施导出
-     *
-     * @param ticketSafeDTO 两票安全措施DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("两票安全措施导出")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-saves-export')")
-  public void export(HttpServletResponse response, TicketSafeDTO ticketSafeDTO) {
-    List<TicketSafe> list = ticketSafeService.getModelListByDTO(ticketSafeDTO);
-    ExcelUtil.exportResponseDict(response, ExportTicketSafeVO.class, BeanConverterUtil.copyListProperties(list, ExportTicketSafeVO.class), "两票安全措施");
-  }
-
-}

platform-rest/src/main/java/com/platform/rest/controller/ticket/TicketSafeExecuteController.java

@@ -1,139 +0,0 @@
-package com.platform.rest.controller.ticket;
-
-import com.platform.common.util.R;
-import com.platform.dao.dto.ticket.TicketSafeExecuteDTO;
-import com.platform.dao.entity.ticket.TicketSafeExecute;
-import com.platform.service.ticket.TicketSafeExecuteService;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.ticket.ExportTicketSafeExecuteVO;
-import com.platform.dao.vo.query.ticket.TicketSafeExecuteVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import lombok.AllArgsConstructor;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.rest.log.annotation.SysLog;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Description 两票安全措施执行任务 控制器
- * @Author future
- * @Date 2020-07-21 14:10:01
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/ticket/ticket-safe-executes")
-public class TicketSafeExecuteController {
-
-  private final  TicketSafeExecuteService ticketSafeExecuteService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<TicketSafeExecute> getById(@PathVariable("id") String id){
-      return new R<>(ticketSafeExecuteService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param ticketSafeExecuteDTO 两票安全措施执行任务DTO
-   * @return R
-   */
-  @SysLog("新增两票安全措施执行任务")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-save-executes-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody TicketSafeExecuteDTO ticketSafeExecuteDTO) {
-      return new R<>(ticketSafeExecuteService.saveModelByDTO(ticketSafeExecuteDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param ticketSafeExecuteDTO 两票安全措施执行任务DTO
-   * @return R
-   */
-  @SysLog("修改两票安全措施执行任务")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-save-executes-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody TicketSafeExecuteDTO ticketSafeExecuteDTO) {
-      ticketSafeExecuteService.modModelByDTO(ticketSafeExecuteDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除两票安全措施执行任务")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-save-executes-del')")
-  public R removeById(@PathVariable String id){
-    ticketSafeExecuteService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除两票安全措施执行任务")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('ticket-ticket-save-executes-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        ticketSafeExecuteService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param ticketSafeExecuteDTO 两票安全措施执行任务DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<TicketSafeExecuteVO>> query(TicketSafeExecuteDTO ticketSafeExecuteDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(ticketSafeExecuteService.selectPageList(ticketSafeExecuteDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param ticketSafeExecuteDTO 两票安全措施执行任务DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(TicketSafeExecuteDTO ticketSafeExecuteDTO) {
-      return new R<>(ticketSafeExecuteService.getModelListByDTO(ticketSafeExecuteDTO));
-  }
-
-  /**
-     * 两票安全措施执行任务导出
-     *
-     * @param ticketSafeExecuteDTO 两票安全措施执行任务DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("两票安全措施执行任务导出")
-  @PreAuthorize("@pms.hasPermission('ticket-ticket-save-executes-export')")
-  public void export(HttpServletResponse response, TicketSafeExecuteDTO ticketSafeExecuteDTO) {
-    List<TicketSafeExecute> list = ticketSafeExecuteService.getModelListByDTO(ticketSafeExecuteDTO);
-    ExcelUtil.exportResponseDict(response, ExportTicketSafeExecuteVO.class, BeanConverterUtil.copyListProperties(list, ExportTicketSafeExecuteVO.class), "两票安全措施执行任务");
-  }
-
-}

platform-service/src/main/java/com/platform/service/activiti/ActivitiAssignStrategy.java

@@ -21,9 +21,10 @@ public interface ActivitiAssignStrategy<T extends Serializable> {
     /**
      * 获取审批内容
      * @param element
+     * @param userId 发起人id，用于根据发起人部门筛选角色等人员。如果部根据发起人,可以为空
      * @param activitiUserModel 请求参数，根据请求参数进行设置
      * @return
      */
-    void handleAssign(Element element, ActivitiUserModel activitiUserModel);
+    void handleAssign(Element element, String userId, ActivitiUserModel activitiUserModel);
 
 }

platform-service/src/main/java/com/platform/service/activiti/ActivitiUserModelService.java

@@ -5,6 +5,7 @@ import com.platform.dao.dto.activiti.ActivitiUserModelDTO;
 import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.service.base.IBaseService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -41,5 +42,6 @@ public interface ActivitiUserModelService extends IBaseService<ActivitiUserModel
 
     List<ActivitiUserModel> getModelByModelId(String modelId);
 
-    void modify(String modeId, List<ActivitiUserModel> list);
+    void modify(String modeId, String userId, List<ActivitiUserModel> list);
+
 }

platform-service/src/main/java/com/platform/service/activiti/impl/ActivitiUserModelServiceImpl.java

@@ -141,23 +141,6 @@ public class ActivitiUserModelServiceImpl extends BaseServiceImpl<ActivitiUserMo
             userTaskModel.setReModelId(modelId);
             userTaskModel.setDeploymentId(deploymentId);
             userTaskModel.setName(element.attributeValue("name"));
-            Integer type = ActivitiUserModelTypeEnum.USER.getValue();
-            String assignee = element.attributeValue("assignee");
-            String candidateUsers = element.attributeValue("candidateUsers");
-            String candidateGroups = element.attributeValue("candidateGroups");
-            if (StringUtils.isNotEmpty(candidateGroups)) {
-                type = 3;
-                userTaskModel.setCandidateGroups(candidateGroups);
-            }
-            if (StringUtils.isNotEmpty(candidateUsers)) {
-                type = 2;
-                userTaskModel.setCandidateUsers(candidateUsers);
-            }
-            if (StringUtils.isNotEmpty(assignee)) {
-                type = 1;
-                userTaskModel.setAssignee(assignee);
-            }
-            userTaskModel.setType(type);
             list.add(userTaskModel);
         }
         bis.close();
@@ -180,15 +163,16 @@ public class ActivitiUserModelServiceImpl extends BaseServiceImpl<ActivitiUserMo
     }
 
     /**
-     * 修改审批节点
+     * 修改审批节点：
      *
      * @param modeId
+     * @param userId,发起人信息，为了设置
      * @param list
      * @throws Exception
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void modify(String modeId, List<ActivitiUserModel> list) {
+    public void modify(String modeId, String userId, List<ActivitiUserModel> list) {
         try {
             Model model = repositoryService.getModel(modeId);
             String deploymentId = model.getDeploymentId();
@@ -221,7 +205,7 @@ public class ActivitiUserModelServiceImpl extends BaseServiceImpl<ActivitiUserMo
             }*/
                 ActivitiAssignStrategy activitiAssignStrategy =
                         activitiAssignStrategyList.stream().filter(strategy -> strategy.getType().equals(type)).collect(Collectors.toList()).get(0);
-                activitiAssignStrategy.handleAssign(element, userTaskModel);
+                activitiAssignStrategy.handleAssign(element, userId, userTaskModel);
                 userTaskModel.setDeploymentId(model.getDeploymentId());
             /*switch (type) {
                 case 1:

platform-service/src/main/java/com/platform/service/activiti/strategy/ActivitiAssignStrategyRole.java

@@ -31,13 +31,17 @@ public class ActivitiAssignStrategyRole implements ActivitiAssignStrategy<String
 
     private final SysUserService sysUserService;
     private final SysRoleService sysRoleService;
+    /**
+     * @see ActivitiUserModelTypeEnum
+     * @return 策略能处理的类型
+     */
     @Override
     public Integer getType() {
         return ActivitiUserModelTypeEnum.ROLE.getValue();
     }
 
     @Override
-    public void handleAssign(Element element, ActivitiUserModel activitiUserModel) {
+    public void handleAssign(Element element, String userId, ActivitiUserModel activitiUserModel) {
         String roleId = activitiUserModel.getRoleId();
         SysUserDTO sysUserDTO = new SysUserDTO();
         sysUserDTO.setRoleIds(Arrays.asList(roleId));

platform-service/src/main/java/com/platform/service/activiti/strategy/ActivitiAssignStrategyStartUser.java

@@ -0,0 +1,56 @@
+package com.platform.service.activiti.strategy;
+
+import com.platform.common.exception.BusinessException;
+import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
+import com.platform.dao.enums.ActivitiUserModelTypeEnum;
+import com.platform.dao.vo.SysRoleVO;
+import com.platform.dao.vo.SysUserVO;
+import com.platform.service.activiti.ActivitiAssignStrategy;
+import com.platform.service.upms.SysRoleService;
+import com.platform.service.upms.SysUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Attribute;
+import org.dom4j.Element;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 指定发起人，有些流程需要指定发起人的，比如填报的初始流程，指定发起人就行了
+ */
+@Service("activitiAssignStrategyStartUser")
+@AllArgsConstructor
+@Slf4j
+public class ActivitiAssignStrategyStartUser implements ActivitiAssignStrategy<String> {
+
+    /**
+     * @see ActivitiUserModelTypeEnum
+     * @return 策略能处理的类型
+     */
+    @Override
+    public Integer getType() {
+        return ActivitiUserModelTypeEnum.START_USER.getValue();
+    }
+
+    @Override
+    public void handleAssign(Element element, String userId, ActivitiUserModel activitiUserModel) {
+        Attribute assignee = element.attribute("assignee");
+        if (assignee != null) {
+            log.info(assignee.getValue());
+            element.remove(assignee);
+        }
+        element.addAttribute("activiti:assignee", userId);
+        // 指定人员的，就不会指定角色，需要清除
+        Attribute candidateUsers = element.attribute("candidateUsers");
+        if (candidateUsers != null) {
+            log.info(candidateUsers.getValue());
+            element.remove(candidateUsers);
+        }
+    }
+}

platform-service/src/main/java/com/platform/service/activiti/strategy/ActivitiAssignStrategyStartUserDeptRole.java

@@ -0,0 +1,77 @@
+package com.platform.service.activiti.strategy;
+
+import com.platform.common.exception.BusinessException;
+import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
+import com.platform.dao.entity.upms.SysUserDept;
+import com.platform.dao.enums.ActivitiUserModelTypeEnum;
+import com.platform.dao.vo.SysRoleVO;
+import com.platform.dao.vo.SysUserVO;
+import com.platform.service.activiti.ActivitiAssignStrategy;
+import com.platform.service.upms.SysRoleService;
+import com.platform.service.upms.SysUserDeptService;
+import com.platform.service.upms.SysUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Attribute;
+import org.dom4j.Element;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 发起人部门,下面的单个角色
+ */
+@Service("activitiAssignStrategyStartUserDeptRole")
+@AllArgsConstructor
+@Slf4j
+public class ActivitiAssignStrategyStartUserDeptRole implements ActivitiAssignStrategy<String> {
+
+    private final SysUserService sysUserService;
+    private final SysRoleService sysRoleService;
+    private final SysUserDeptService sysUserDeptService;
+    /**
+     * @see ActivitiUserModelTypeEnum
+     * @return 策略能处理的类型
+     */
+    @Override
+    public Integer getType() {
+        return ActivitiUserModelTypeEnum.START_USER_DEPT_ROLE.getValue();
+    }
+
+    @Override
+    public void handleAssign(Element element, String userId, ActivitiUserModel activitiUserModel) {
+        String roleId = activitiUserModel.getRoleId();
+        SysUserDTO sysUserDTO = new SysUserDTO();
+        sysUserDTO.setRoleIds(Arrays.asList(roleId));
+
+        // 找到和发起人部门一致的
+        sysUserDTO.setDeptIds(sysUserDeptService.selectByUserId(userId).stream().map(SysUserDept::getDeptId).collect(Collectors.toList()));
+        List<SysUserVO> sysUserVOList = sysUserService.getDeptChildrenRoleUser(sysUserDTO);
+        if(CollectionUtils.isEmpty(sysUserVOList)){
+            SysRoleVO sysRoleVO = sysRoleService.selectRoleVOByRoleId(roleId);
+            if(sysRoleVO == null){
+                throw new BusinessException("发起人部门下面查询不到角色，请先设置，角色名称：" + sysRoleVO.getRoleName());
+            }
+            throw new BusinessException("查询不到角色对应人员，请先设置，角色名称：" + sysRoleVO.getRoleName());
+        }
+        Attribute candidateUsers = element.attribute("candidateUsers");
+        if (candidateUsers != null) {
+            log.info(candidateUsers.getValue());
+            element.remove(candidateUsers);
+        }
+        List<String> ids = sysUserVOList.stream().map(SysUserVO::getUserId).collect(Collectors.toList());
+        element.addAttribute("activiti:candidateUsers", StringUtils.join(ids, ","));
+
+        // 指定角色的，就不会指定人员，需要清除
+        Attribute assignee = element.attribute("assignee");
+        if (assignee != null) {
+            log.info(assignee.getValue());
+            element.remove(assignee);
+        }
+    }
+}

platform-service/src/main/java/com/platform/service/activiti/strategy/ActivitiAssignStrategyUser.java

@@ -16,13 +16,17 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 @Slf4j
 public class ActivitiAssignStrategyUser implements ActivitiAssignStrategy<String> {
+    /**
+     * @see ActivitiUserModelTypeEnum
+     * @return 策略能处理的类型
+     */
     @Override
     public Integer getType() {
         return ActivitiUserModelTypeEnum.USER.getValue();
     }
 
     @Override
-    public void handleAssign(Element element, ActivitiUserModel activitiUserModel) {
+    public void handleAssign(Element element, String userId, ActivitiUserModel activitiUserModel) {
         Attribute assignee = element.attribute("assignee");
         if (assignee != null) {
             log.info(assignee.getValue());

platform-service/src/main/java/com/platform/service/business/SbInfoActivitiBusinessService.java → platform-service/src/main/java/com/platform/service/business/SbScrapActivitiBusinessService.java

@@ -1,31 +1,20 @@
 package com.platform.service.business;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.platform.activiti.bean.ActObj;
 import com.platform.activiti.dao.entity.ActApplyInfo;
 import com.platform.activiti.dao.entity.ActAuditRecord;
 import com.platform.activiti.enums.ActApplyEnum;
-import com.platform.activiti.service.ActivitiService;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.SecurityUtils;
-import com.platform.dao.dto.sb.SbInfoDTO;
-import com.platform.dao.dto.upms.SysDeptDTO;
-import com.platform.dao.dto.upms.SysUserDTO;
-import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.upms.SysUser;
-import com.platform.dao.enums.DeptCodeEnum;
-import com.platform.dao.enums.DeptNatureEnum;
-import com.platform.dao.enums.PurchaseAuditNodeEnum;
-import com.platform.dao.enums.SbInfoStatusEnum;
-import com.platform.dao.mapper.upms.SysDeptMapper;
-import com.platform.dao.mapper.upms.SysUserMapper;
-import com.platform.dao.vo.SysUserVO;
-import com.platform.dao.vo.query.upms.SysDeptVO;
-import com.platform.service.sb.SbInfoService;
-import com.platform.service.upms.SysDeptService;
+import com.platform.service.activiti.ActivitiUserModelService;
+import com.platform.service.sb.SbScrapFormService;
 import com.platform.service.upms.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,11 +22,12 @@ import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricDetail;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricVariableUpdate;
-import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.repository.Model;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -49,42 +39,55 @@ import java.util.*;
  * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
  */
 @AllArgsConstructor
-@Service("sbInfoActivitiBusinessService")
+@Service("sbScrapActivitiBusinessService")
 @Slf4j
-public class SbInfoActivitiBusinessService {
-
-    private final SbInfoService sbInfoService;
+public class SbScrapActivitiBusinessService {
+    
+    private SbScrapFormService sbScrapFormService;
+    private RepositoryService repositoryService;
     private final IdentityService identityService;
     private final RuntimeService runtimeService;
     private final HistoryService historyService;
     private final TaskService taskService;
     private final SysUserService sysUserService;
 
+    private final ActivitiUserModelService activitiUserModelService;
+
     /**
      * 启动，第一个审批人为发起人，自动审批。
+     * 提交前，根据提交人员设置审批业务里面每个人员信息
+     * 然后在提交审批，保存数据
      * 审批设置对象：ActApplyInfo
-     * @param sbInfoDTO
+     *
+     * @param sbScrapFormDTO
      */
-    public ProcessInstance start(SbInfoDTO sbInfoDTO){
+    @Transactional(rollbackFor = Exception.class)
+    public ProcessInstance start(SbScrapFormDTO sbScrapFormDTO) {
+        UserInfo user = SecurityUtils.getUserInfo();
+
+        // 设置各个节点审批人员信息
+        Model model = repositoryService.createModelQuery().modelKey(ActApplyEnum.SB_INFO_SCRAP.getKey()).singleResult();
+        List<ActivitiUserModel> list = activitiUserModelService.getModelByModelId(model.getId());
+        activitiUserModelService.modify(model.getId(), user.getUserId(), list);
+
         // 设置发起对象，保存到流程实例中
-        ActApplyInfo applyInfo = new ActApplyInfo(sbInfoDTO.getId(),
+        ActApplyInfo applyInfo = new ActApplyInfo(sbScrapFormDTO.getId(),
                 ActApplyEnum.SB_INFO_SCRAP.getName(), ActApplyEnum.SB_INFO_SCRAP.getKey(),
                 0,
                 LocalDateTime.now());
         Map<String, Object> map = new HashMap<>(1);
-        UserInfo user = SecurityUtils.getUserInfo();
+
         applyInfo.setUserId(user.getUserId());
         applyInfo.setUserName(user.getRealName());
         map.put("data", applyInfo);
         map.put("userId", applyInfo.getUserId());
         // 设置流程启动人信息，为了后面查询我的发起列表
         identityService.setAuthenticatedUserId(user.getUserId());
-
         ProcessInstance instance = null;
-        if(StringUtils.isBlank(sbInfoDTO.getProcessInstanceId())){
-            instance = runtimeService.startProcessInstanceByKey(ActApplyEnum.SB_INFO_SCRAP.getKey(), map);
-        }else{ // 再次提交审批的，之前被拒绝的
-            instance = runtimeService.startProcessInstanceById(sbInfoDTO.getProcessInstanceId(), map);
+        if (StringUtils.isBlank(sbScrapFormDTO.getProcessInstanceId())) {
+            instance = runtimeService.startProcessInstanceByKey(ActApplyEnum.SB_INFO_SCRAP.getKey(), sbScrapFormDTO.getId(), map);
+        } else { // 再次提交审批的，之前被拒绝的
+            instance = runtimeService.startProcessInstanceById(sbScrapFormDTO.getProcessInstanceId(), sbScrapFormDTO.getId(), map);
         }
         if (instance == null) {
             throw new BusinessException(ResultCode.ACTIVITI_PROCESS_NOT_EXIST.getDescription());
@@ -101,23 +104,27 @@ public class SbInfoActivitiBusinessService {
         Map<String, Object> data = new HashMap<>();
         data.put(CommonConstants.ACT_AUDIT_RECORD, records);
         data.put("result", 1);
-        taskService.addComment(task.getId(), sbInfoDTO.getProcessInstanceId(), "提交");
+        taskService.addComment(task.getId(), sbScrapFormDTO.getProcessInstanceId(), "提交");
         taskService.complete(task.getId(), map);
+
+        sbScrapFormService.updateByActivitiStart(instance.getId(), sbScrapFormDTO.getId());
         return instance;
     }
 
     /**
-     * 启动，第一个审批人为发起人，自动审批。
+     * 审批，第一个审批人为发起人，自动审批。
      * 审批设置对象：ActApplyInfo
-     * @param sbInfoDTO
+     *
+     * @param sbScrapFormDTO
      */
-    public boolean audit(SbInfoDTO sbInfoDTO){
+    @Transactional(rollbackFor = Exception.class)
+    public boolean audit(SbScrapFormDTO sbScrapFormDTO) {
         UserInfo user = SecurityUtils.getUserInfo();
         // 设置发起对象，保存到流程实例中
-        String taskId = sbInfoDTO.getTaskId();
+        String taskId = sbScrapFormDTO.getTaskId();
         Map<String, Object> map = new HashMap<>();
         Integer result = 0;
-        if (sbInfoDTO.getAuditFlag()) {
+        if (sbScrapFormDTO.getAuditFlag()) {
             result = 1;// 同意
         } else {
             result = 0;// 拒绝
@@ -130,36 +137,44 @@ public class SbInfoActivitiBusinessService {
         if (o != null) {
             records = (List<ActAuditRecord>) o;
         }
-        boolean flag = result==0?false:true;
-        records.add(0, new ActAuditRecord(user.getUserId(), user.getRealName(), sbInfoDTO.getRefuseReason(),
-                LocalDateTime.now(), result==0?false:true, taskId, task.getName()));
+        boolean flag = result == 0 ? false : true;
+        records.add(0, new ActAuditRecord(user.getUserId(), user.getRealName(), sbScrapFormDTO.getRefuseReason(),
+                LocalDateTime.now(), result == 0 ? false : true, taskId, task.getName()));
         map.put(CommonConstants.ACT_AUDIT_RECORD, records);
-        taskService.addComment(taskId, sbInfoDTO.getProcessInstanceId(), sbInfoDTO.getRefuseReason());
+        taskService.addComment(taskId, sbScrapFormDTO.getProcessInstanceId(), sbScrapFormDTO.getRefuseReason());
         taskService.complete(taskId, map);
+
+        // 更新结果
+        sbScrapFormService.updateByActivitiFinish(sbScrapFormDTO.getId(), flag);
         return flag;
     }
 
     /**
      * 终止审核
      * 审批设置对象：ActApplyInfo
-     * @param sbInfoDTO
+     *
+     * @param sbScrapFormDTO
      */
-    public void stop(SbInfoDTO sbInfoDTO){
-        String processInstanceId = sbInfoDTO.getProcessInstanceId();
+    @Transactional(rollbackFor = Exception.class)
+    public void stop(SbScrapFormDTO sbScrapFormDTO) {
+        String processInstanceId = sbScrapFormDTO.getProcessInstanceId();
         if (StringUtils.isNotEmpty(processInstanceId)) {
             runtimeService.deleteProcessInstance(processInstanceId, "");
             historyService.deleteHistoricProcessInstance(processInstanceId);
         }
+        sbScrapFormService.updateByActivitiStop(processInstanceId, sbScrapFormDTO.getId());
     }
 
     /**
      * 转签
      * 审批设置对象：ActApplyInfo
-     * @param sbInfoDTO
+     *
+     * @param sbScrapFormDTO
      */
-    public void assign(SbInfoDTO sbInfoDTO){
-        String taskId = sbInfoDTO.getTaskId();
-        String userId = sbInfoDTO.getChangeUser();
+    @Transactional(rollbackFor = Exception.class)
+    public void assign(SbScrapFormDTO sbScrapFormDTO) {
+        String taskId = sbScrapFormDTO.getTaskId();
+        String userId = sbScrapFormDTO.getChangeUser();
         if (StringUtils.isEmpty(taskId)) {
             throw new BusinessException("taskId为空，请选择");
         }
@@ -167,7 +182,7 @@ public class SbInfoActivitiBusinessService {
             throw new BusinessException("请设置转签人员");
         }
         SysUser sysUser = sysUserService.getModelById(userId);
-        if(sysUser == null){
+        if (sysUser == null) {
             throw new BusinessException("用户不存在，请选择其他人员");
         }
         taskService.setAssignee(taskId, userId);
@@ -176,9 +191,10 @@ public class SbInfoActivitiBusinessService {
     /**
      * 审核历史：都在ActRecord里面
      * 审批设置对象：ActApplyInfo
+     *
      * @param processInstanceId
      */
-    public List<ActAuditRecord> history(String processInstanceId){
+    public List<ActAuditRecord> history(String processInstanceId) {
         ProcessInstance instance = runtimeService.createProcessInstanceQuery()
                 .processInstanceId(processInstanceId).singleResult();
         //保证运行ing
@@ -209,6 +225,7 @@ public class SbInfoActivitiBusinessService {
 
     /**
      * 判定流程是否结束
+     *
      * @param processInstanceId
      * @return
      */

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -258,6 +258,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         weekend.weekendCriteria().andIsNotNull(RepairApplicationForm::getId).andEqualTo(RepairApplicationForm::getType, model.getType());
         int count = mapper.selectCountByExample(weekend);
+        model.setNo(IdGeneratorUtils.getRepairApplicaitonFormNo(++count));
         // 查询对应的维修人，保存维修单
         String sbId = model.getSbId();
         SbInfo sb = sbInfoService.getModelById(sbId);
@@ -317,7 +318,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         }
 
         model.setOutNo(model.getOutNo());
-        model.setNo(IdGeneratorUtils.getRepairApplicaitonFormNo(++count));
 
         // 循环给第一维修人和第二维修人发消息
         List<String> openIds = new ArrayList<>();

platform-service/src/main/java/com/platform/service/sb/SbScrapFormService.java

@@ -0,0 +1,44 @@
+package com.platform.service.sb;
+
+import com.platform.dao.vo.query.sb.SbScrapFormVO;
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.dao.entity.sb.SbScrapForm;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+
+import java.util.List;
+
+/**
+ * @Description 设备报废单 service
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface SbScrapFormService extends IBaseService<SbScrapForm, SbScrapFormDTO> {
+
+    /**
+     * 批量删除
+     *
+     * @param ids ：
+     * @return ：
+     */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     *
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<SbScrapFormVO> selectPageList(SbScrapFormDTO record, int pageNum, int pageSize);
+
+    void updateStatusById(String id, Integer status);
+
+    void updateByActivitiStart(String processInstanceId, String id);
+
+    void updateByActivitiFinish(String id, boolean flag);
+
+    void updateByActivitiStop(String processInstanceId, String id);
+}

platform-service/src/main/java/com/platform/service/sb/impl/SbScrapFormServiceImpl.java

@@ -0,0 +1,176 @@
+package com.platform.service.sb.impl;
+
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.exception.BusinessException;
+import com.platform.common.model.UserInfo;
+import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.SecurityUtils;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.entity.repair.RepairApplicationForm;
+import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.enums.ActivitiFormStatusEnum;
+import com.platform.dao.enums.SbInfoStatusEnum;
+import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.vo.query.sb.SbScrapFormVO;
+import com.platform.dao.dto.sb.SbScrapFormDTO;
+import com.platform.dao.entity.sb.SbScrapForm;
+import com.platform.dao.mapper.sb.SbScrapFormMapper;
+import com.platform.service.sb.SbScrapFormService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 设备报废单 service 实现类
+ * @Author xc
+ * @Date 2022-05-26 18:00:42
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("sbScrapFormService")
+public class SbScrapFormServiceImpl extends BaseServiceImpl<SbScrapFormMapper, SbScrapForm, SbScrapFormDTO> implements SbScrapFormService {
+
+    private final SbInfoMapper sbInfoMapper;
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<SbScrapForm> weekend = new Weekend<>(SbScrapForm.class);
+        WeekendCriteria<SbScrapForm, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(SbScrapForm::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public SbScrapForm saveModelByDTO(SbScrapFormDTO model) {
+
+        Weekend<SbScrapForm> weekendCheck = new Weekend<>(SbScrapForm.class);
+        weekendCheck.weekendCriteria().andEqualTo(SbScrapForm::getSbId, model.getSbId());
+        int countCheck = mapper.selectCountByExample(weekendCheck);
+        if (countCheck > 0) {
+            throw new BusinessException("该设备已经存在报废单，无法重复申请");
+        }
+        Weekend<SbScrapForm> weekend = new Weekend<>(SbScrapForm.class);
+        weekend.weekendCriteria().andIsNotNull(SbScrapForm::getId);
+        int count = mapper.selectCountByExample(weekend);
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        model.setApplyUserId(userInfo.getUserId());
+        model.setApplyUserName(userInfo.getRealName());
+        model.setNo(IdGeneratorUtils.getSbScrapFormNo(++count));
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(model.getSbId());
+        if (sbInfo.getStatus().equals(SbInfoStatusEnum.SCRAPED.getValue())) {
+            throw new BusinessException("设备已经报废");
+        }
+        if (sbInfo.getStatus().equals(SbInfoStatusEnum.IN_SCRAP.getValue())) {
+            throw new BusinessException("设备已在报废审批流程中");
+        }
+        sbInfo.setId(model.getSbId());
+        sbInfo.setWorkYear(model.getWorkYear());
+        sbInfo.setStartDate(model.getStartDate());
+        sbInfo.setInitialValue(model.getInitialValue());
+        sbInfo.setCurrentValue(model.getCurrentValue());
+        sbInfoMapper.updateByPrimaryKeySelective(sbInfo);
+        return super.saveModelByDTO(model);
+    }
+
+    @Override
+    public void modModelByDTO(SbScrapFormDTO model) {
+        Weekend<SbScrapForm> weekendCheck = new Weekend<>(SbScrapForm.class);
+        weekendCheck.weekendCriteria().andEqualTo(SbScrapForm::getSbId, model.getSbId());
+        SbScrapForm check = mapper.selectOneByExample(weekendCheck);
+        if (check != null && !check.getId().equals(model.getId())) {
+            throw new BusinessException("该设备已经存在报废单，无法重复申请");
+        }
+        SbInfo sbInfo = new SbInfo();
+        sbInfo.setId(model.getSbId());
+        sbInfo.setWorkYear(model.getWorkYear());
+        sbInfo.setStartDate(model.getStartDate());
+        sbInfo.setInitialValue(model.getInitialValue());
+        sbInfo.setCurrentValue(model.getCurrentValue());
+        sbInfoMapper.updateByPrimaryKeySelective(sbInfo);
+        super.modModelByDTO(model);
+    }
+
+    @Override
+    public AbstractPageResultBean<SbScrapFormVO> selectPageList(SbScrapFormDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<SbScrapForm> selectPageInfo(SbScrapFormDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStatusById(String id, Integer status) {
+        SbScrapForm updInfo = new SbScrapForm();
+        updInfo.setId(id);
+        updInfo.setStatus(status);
+        mapper.updateByPrimaryKeySelective(updInfo);
+    }
+
+    @Override
+    public void updateByActivitiStart(String processInstanceId, String id) {
+        SbScrapForm updInfo = mapper.selectByPrimaryKey(id);
+        updInfo.setId(id);
+        updInfo.setStatus(ActivitiFormStatusEnum.EXECUTING.getValue());
+        updInfo.setProcessInstanceId(processInstanceId);
+        mapper.updateByPrimaryKeySelective(updInfo);
+
+        SbInfo sbInfo = new SbInfo();
+        sbInfo.setStatus(SbInfoStatusEnum.IN_SCRAP.getValue());
+        sbInfo.setId(updInfo.getSbId());
+        sbInfoMapper.updateByPrimaryKeySelective(sbInfo);
+    }
+
+    /**
+     * 根据审批结果更新状态
+     *
+     * @param id
+     * @param flag
+     */
+    @Override
+    public void updateByActivitiFinish(String id, boolean flag) {
+        SbScrapForm updInfo = mapper.selectByPrimaryKey(id);
+        updInfo.setId(id);
+        updInfo.setStatus(flag ? ActivitiFormStatusEnum.EXECUTING.getValue() : ActivitiFormStatusEnum.REFUSE.getValue());
+        mapper.updateByPrimaryKeySelective(updInfo);
+
+        if (flag) {
+            SbInfo sbInfo = new SbInfo();
+            sbInfo.setStatus(SbInfoStatusEnum.SCRAPED.getValue());
+            sbInfo.setId(updInfo.getSbId());
+            sbInfoMapper.updateByPrimaryKeySelective(sbInfo);
+        }
+    }
+
+    /**
+     * 根据审批结果更新状态
+     *
+     * @param processInstanceId
+     * @param id
+     */
+    @Override
+    public void updateByActivitiStop(String processInstanceId, String id) {
+        SbScrapForm updInfo = mapper.selectByPrimaryKey(id);
+        updInfo.setId(id);
+        updInfo.setProcessInstanceId(null);
+        updInfo.setStatus(ActivitiFormStatusEnum.NOT_EXECUTE.getValue());
+        mapper.updateByPrimaryKeySelective(updInfo);
+
+        SbInfo sbInfo = new SbInfo();
+        sbInfo.setStatus(SbInfoStatusEnum.IN_STORE.getValue());
+        sbInfo.setId(updInfo.getSbId());
+        sbInfoMapper.updateByPrimaryKeySelective(sbInfo);
+
+    }
+}

platform-service/src/main/java/com/platform/service/ticket/TicketExecuteService.java

@@ -1,34 +0,0 @@
-package com.platform.service.ticket;
-
-import com.platform.dao.vo.query.ticket.TicketExecuteVO;
-import com.platform.dao.dto.ticket.TicketExecuteDTO;
-import com.platform.dao.entity.ticket.TicketExecute;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.service.base.IBaseService;
-import java.util.List;
-
-/**
- * @Description 两票工作票执行单 service
- * @Author future
- * @Date 2020-07-21 14:07:58
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface TicketExecuteService extends IBaseService<TicketExecute, TicketExecuteDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    AbstractPageResultBean<TicketExecuteVO> selectPageList(TicketExecuteDTO record, int pageNum, int pageSize);
-}

platform-service/src/main/java/com/platform/service/ticket/TicketSafeExecuteService.java

@@ -1,34 +0,0 @@
-package com.platform.service.ticket;
-
-import com.platform.dao.vo.query.ticket.TicketSafeExecuteVO;
-import com.platform.dao.dto.ticket.TicketSafeExecuteDTO;
-import com.platform.dao.entity.ticket.TicketSafeExecute;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.service.base.IBaseService;
-import java.util.List;
-
-/**
- * @Description 两票安全措施执行任务 service
- * @Author future
- * @Date 2020-07-21 14:10:01
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface TicketSafeExecuteService extends IBaseService<TicketSafeExecute, TicketSafeExecuteDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    AbstractPageResultBean<TicketSafeExecuteVO> selectPageList(TicketSafeExecuteDTO record, int pageNum, int pageSize);
-}

platform-service/src/main/java/com/platform/service/ticket/TicketSafeService.java

@@ -1,34 +0,0 @@
-package com.platform.service.ticket;
-
-import com.platform.dao.vo.query.ticket.TicketSafeVO;
-import com.platform.dao.dto.ticket.TicketSafeDTO;
-import com.platform.dao.entity.ticket.TicketSafe;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.service.base.IBaseService;
-import java.util.List;
-
-/**
- * @Description 两票安全措施 service
- * @Author future
- * @Date 2020-07-21 14:10:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface TicketSafeService extends IBaseService<TicketSafe, TicketSafeDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    AbstractPageResultBean<TicketSafeVO> selectPageList(TicketSafeDTO record, int pageNum, int pageSize);
-}

platform-service/src/main/java/com/platform/service/ticket/TicketService.java

@@ -1,34 +0,0 @@
-package com.platform.service.ticket;
-
-import com.platform.dao.vo.query.ticket.TicketVO;
-import com.platform.dao.dto.ticket.TicketDTO;
-import com.platform.dao.entity.ticket.Ticket;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.service.base.IBaseService;
-import java.util.List;
-
-/**
- * @Description 工作票标准票 service
- * @Author future
- * @Date 2020-07-21 10:43:10
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface TicketService extends IBaseService<Ticket, TicketDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    AbstractPageResultBean<TicketVO> selectPageList(TicketDTO record, int pageNum, int pageSize);
-}

platform-service/src/main/java/com/platform/service/ticket/impl/TicketExecuteServiceImpl.java

@@ -1,48 +0,0 @@
-package com.platform.service.ticket.impl;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.ticket.TicketExecuteVO;
-import com.platform.dao.dto.ticket.TicketExecuteDTO;
-import com.platform.dao.entity.ticket.TicketExecute;
-import com.platform.dao.mapper.ticket.TicketExecuteMapper;
-import com.platform.service.ticket.TicketExecuteService;
-import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @Description 两票工作票执行单 service 实现类
- * @Author future
- * @Date 2020-07-21 14:07:58
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("ticketExecuteService")
-public class TicketExecuteServiceImpl extends BaseServiceImpl<TicketExecuteMapper, TicketExecute, TicketExecuteDTO> implements TicketExecuteService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<TicketExecute> weekend = new Weekend<>(TicketExecute.class);
-        WeekendCriteria<TicketExecute, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(TicketExecute::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketExecuteVO> selectPageList(TicketExecuteDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketExecute> selectPageInfo(TicketExecuteDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-}

platform-service/src/main/java/com/platform/service/ticket/impl/TicketSafeExecuteServiceImpl.java

@@ -1,48 +0,0 @@
-package com.platform.service.ticket.impl;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.ticket.TicketSafeExecuteVO;
-import com.platform.dao.dto.ticket.TicketSafeExecuteDTO;
-import com.platform.dao.entity.ticket.TicketSafeExecute;
-import com.platform.dao.mapper.ticket.TicketSafeExecuteMapper;
-import com.platform.service.ticket.TicketSafeExecuteService;
-import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @Description 两票安全措施执行任务 service 实现类
- * @Author future
- * @Date 2020-07-21 14:10:01
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("ticketSafeExecuteService")
-public class TicketSafeExecuteServiceImpl extends BaseServiceImpl<TicketSafeExecuteMapper, TicketSafeExecute, TicketSafeExecuteDTO> implements TicketSafeExecuteService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<TicketSafeExecute> weekend = new Weekend<>(TicketSafeExecute.class);
-        WeekendCriteria<TicketSafeExecute, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(TicketSafeExecute::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketSafeExecuteVO> selectPageList(TicketSafeExecuteDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketSafeExecute> selectPageInfo(TicketSafeExecuteDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-}

platform-service/src/main/java/com/platform/service/ticket/impl/TicketSafeServiceImpl.java

@@ -1,48 +0,0 @@
-package com.platform.service.ticket.impl;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.ticket.TicketSafeVO;
-import com.platform.dao.dto.ticket.TicketSafeDTO;
-import com.platform.dao.entity.ticket.TicketSafe;
-import com.platform.dao.mapper.ticket.TicketSafeMapper;
-import com.platform.service.ticket.TicketSafeService;
-import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @Description 两票安全措施 service 实现类
- * @Author future
- * @Date 2020-07-21 14:10:28
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("ticketSafeService")
-public class TicketSafeServiceImpl extends BaseServiceImpl<TicketSafeMapper, TicketSafe, TicketSafeDTO> implements TicketSafeService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<TicketSafe> weekend = new Weekend<>(TicketSafe.class);
-        WeekendCriteria<TicketSafe, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(TicketSafe::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketSafeVO> selectPageList(TicketSafeDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketSafe> selectPageInfo(TicketSafeDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-}

platform-service/src/main/java/com/platform/service/ticket/impl/TicketServiceImpl.java

@@ -1,48 +0,0 @@
-package com.platform.service.ticket.impl;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.ticket.TicketVO;
-import com.platform.dao.dto.ticket.TicketDTO;
-import com.platform.dao.entity.ticket.Ticket;
-import com.platform.dao.mapper.ticket.TicketMapper;
-import com.platform.service.ticket.TicketService;
-import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @Description 工作票标准票 service 实现类
- * @Author future
- * @Date 2020-07-21 10:43:10
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("ticketService")
-public class TicketServiceImpl extends BaseServiceImpl<TicketMapper, Ticket, TicketDTO> implements TicketService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<Ticket> weekend = new Weekend<>(Ticket.class);
-        WeekendCriteria<Ticket, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(Ticket::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<TicketVO> selectPageList(TicketDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<Ticket> selectPageInfo(TicketDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-}