修改swagger生成的注释

ktg-generator/src/main/resources/vm/java/domain.java.vm

@@ -2,7 +2,7 @@ package ${packageName}.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 #foreach ($import in $importList)
 import ${import};
 #end
@@ -32,8 +32,7 @@ public class ${ClassName} extends ${Entity}
 
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-    @Schema(description = "$column.columnComment")
+    @ApiModelProperty(value = "$column.columnComment")
 #if($column.list)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsSopController.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -11,12 +10,12 @@ import com.ktg.iscs.domain.IsSop;
 import com.ktg.iscs.domain.dto.sop.AddSopDTO;
 import com.ktg.iscs.domain.dto.sop.PageSopDTO;
 import com.ktg.iscs.domain.vo.sop.SopDetailVO;
+import com.ktg.iscs.domain.vo.sop.SopPageVO;
 import com.ktg.iscs.service.IIsSopService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -47,18 +46,8 @@ public class IsSopController extends BaseController {
     })
     @PreAuthorize("@ss.hasPermi('iscs:sop:list')")
     @GetMapping("/getIsSopPage")
-    public CommonResult<Page<IsSop>> getIsSopPage(Page<IsSop> page, PageSopDTO dto) {
-        Page<IsSop> result = isSopService.page(page, Wrappers.<IsSop>lambdaQuery()
-                .like(StringUtils.isNotBlank(dto.getSopCode()), IsSop::getSopCode, dto.getSopCode())
-                .like(StringUtils.isNotBlank(dto.getSopName()), IsSop::getSopName, dto.getSopName())
-                .eq(StringUtils.isNotBlank(dto.getSopStatus()), IsSop::getSopStatus, dto.getSopStatus())
-                .eq(dto.getWorkshopId() != null, IsSop::getWorkshopId, dto.getWorkshopId())
-                .eq(dto.getWorkareaId() != null, IsSop::getWorkareaId, dto.getWorkareaId())
-                .eq(StringUtils.isNotBlank(dto.getSopType()), IsSop::getSopType, dto.getSopType())
-                .ge(StringUtils.isNotBlank(dto.getStartTime()), IsSop::getCreateTime, dto.getStartTime())
-                .le(StringUtils.isNotBlank(dto.getEndTime()), IsSop::getCreateTime, dto.getEndTime())
-                .orderByDesc(IsSop::getSopId));
-        return CommonResult.success(result);
+    public CommonResult<Page<SopPageVO>> getIsSopPage(Page<IsSop> page, PageSopDTO dto) {
+        return CommonResult.success(isSopService.getIsSopPage(page, dto));
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsHardware.java

@@ -1,11 +1,11 @@
 package com.ktg.iscs.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -17,97 +17,132 @@ import java.util.Date;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class IsHardware extends BaseBean
-{
+public class IsHardware extends BaseBean {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
-    @Schema(description = "主键id")
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
-    /** 硬件类型编码 */
-    @Schema(description = "硬件编码")
+    /**
+     * 硬件类型编码
+     */
+    @ApiModelProperty(value = "硬件编码")
     @Excel(name = "硬件编码")
     private String hardwareCode;
 
-    /** 硬件类型名称 */
-    @Schema(description = "硬件名称")
+    /**
+     * 硬件类型名称
+     */
+    @ApiModelProperty(value = "硬件名称")
     @Excel(name = "硬件名称")
     private String hardwareName;
 
-    /** 品牌 */
-    @Schema(description = "品牌")
+    /**
+     * 品牌
+     */
+    @ApiModelProperty(value = "品牌")
     @Excel(name = "品牌")
     private String hardwareBrand;
 
-    /** 规格型号 */
-    @Schema(description = "规格型号")
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty(value = "规格型号")
     @Excel(name = "规格型号")
     private String hardwareSpec;
 
-    /** 硬件类型ID */
-    @Schema(description = "硬件类型ID")
+    /**
+     * 硬件类型ID
+     */
+    @ApiModelProperty(value = "硬件类型ID")
     @Excel(name = "硬件类型ID")
     private Long hardwareTypeId;
 
-    /** 硬件类型编码 */
-    @Schema(description = "硬件类型编码")
+    /**
+     * 硬件类型编码
+     */
+    @ApiModelProperty(value = "硬件类型编码")
     @Excel(name = "硬件类型编码")
     private String hardwareTypeCode;
 
-    /** 硬件类型名称 */
-    @Schema(description = "硬件类型名称")
+    /**
+     * 硬件类型名称
+     */
+    @ApiModelProperty(value = "硬件类型名称")
     @Excel(name = "硬件类型名称")
     private String hardwareTypeName;
 
-    /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    /**
+     * 所属车间ID
+     */
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
-    /** 所属车间编码 */
-    @Schema(description = "所属车间编码")
+    /**
+     * 所属车间编码
+     */
+    @ApiModelProperty(value = "所属车间编码")
     @Excel(name = "所属车间编码")
     private String workshopCode;
 
-    /** 所属车间名称 */
-    @Schema(description = "所属车间名称")
+    /**
+     * 所属车间名称
+     */
+    @ApiModelProperty(value = "所属车间名称")
     @Excel(name = "所属车间名称")
     private String workshopName;
 
-    /** 硬件状态 */
-    @Schema(description = "硬件状态")
+    /**
+     * 硬件状态
+     */
+    @ApiModelProperty(value = "硬件状态")
     @Excel(name = "硬件状态")
     private String status;
 
-    /** 启用时间 */
-    @Schema(description = "启用时间")
+    /**
+     * 启用时间
+     */
+    @ApiModelProperty(value = "启用时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "启用时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date activationTime;
 
-    /** 可用次数 */
-    @Schema(description = "可用次数")
+    /**
+     * 可用次数
+     */
+    @ApiModelProperty(value = "可用次数")
     @Excel(name = "可用次数")
     private Integer availableTimes;
 
-    /** 已用次数 */
-    @Schema(description = "已用次数")
+    /**
+     * 已用次数
+     */
+    @ApiModelProperty(value = "已用次数")
     @Excel(name = "已用次数")
     private Integer usedTimes;
 
-    /** 可用寿命 */
-    @Schema(description = "可用寿命")
+    /**
+     * 可用寿命
+     */
+    @ApiModelProperty(value = "可用寿命")
     @Excel(name = "可用寿命")
     private Integer availableLife;
 
-    /** 已用寿命 */
-    @Schema(description = "已用寿命")
+    /**
+     * 已用寿命
+     */
+    @ApiModelProperty(value = "已用寿命")
     @Excel(name = "已用寿命")
     private Integer usedLife;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsHardwareType.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 硬件类型对象 is_hardware_type
@@ -14,45 +14,58 @@ import com.ktg.common.core.domain.model.BaseBean;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class IsHardwareType extends BaseBean
-{
+public class IsHardwareType extends BaseBean {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
-    @Schema(description = "主键id")
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
-    /** 硬件类型编码 */
-    @Schema(description = "硬件类型编码")
+    /**
+     * 硬件类型编码
+     */
+    @ApiModelProperty(value = "硬件类型编码")
     @Excel(name = "硬件类型编码")
     private String hardwareTypeCode;
 
-    /** 硬件类型名称 */
-    @Schema(description = "硬件类型名称")
+    /**
+     * 硬件类型名称
+     */
+    @ApiModelProperty(value = "硬件类型名称")
     @Excel(name = "硬件类型名称")
     private String hardwareTypeName;
 
-    /** 父类型ID */
-    @Schema(description = "父类型ID")
+    /**
+     * 父类型ID
+     */
+    @ApiModelProperty(value = "父类型ID")
     @Excel(name = "父类型ID")
     private Long parentTypeId;
 
-    /** 所有父节点ID */
-    @Schema(description = "所有父节点ID")
+    /**
+     * 所有父节点ID
+     */
+    @ApiModelProperty(value = "所有父节点ID")
     @Excel(name = "所有父节点ID")
     private String ancestors;
 
-    /** 是否启用 */
-    @Schema(description = "是否启用（Y-N）")
+    /**
+     * 是否启用
+     */
+    @ApiModelProperty(value = "是否启用（Y-N）")
     @Excel(name = "是否启用")
     private String enableFlag;
 
-    @Schema(description = "层级")
+    @ApiModelProperty(value = "层级")
     @Excel(name = "层级")
     private String level;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsIsolationPoint.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 隔离点对象 is_isolation_point
@@ -19,56 +19,56 @@ public class IsIsolationPoint extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 隔离点ID */
-    @Schema(description = "隔离点ID")
+    @ApiModelProperty(value = "隔离点ID")
     private Long pointId;
 
     /** 隔离点编号 */
-    @Schema(description = "隔离点编号")
+    @ApiModelProperty(value = "隔离点编号")
     @Excel(name = "隔离点编号")
     private String pointCode;
 
     /** 隔离点名称 */
-    @Schema(description = "隔离点名称")
+    @ApiModelProperty(value = "隔离点名称")
     @Excel(name = "隔离点名称")
     private String pointName;
 
     /** 隔离点类型 */
-    @Schema(description = "隔离点类型")
+    @ApiModelProperty(value = "隔离点类型")
     @Excel(name = "隔离点类型")
     private String pointType;
 
     /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
     /** 所属区域ID */
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     @Excel(name = "所属区域ID")
     private Long workareaId;
 
     /** 危险能量类型 */
-    @Schema(description = "危险能量类型")
+    @ApiModelProperty(value = "危险能量类型")
     @Excel(name = "危险能量类型")
     private String powerType;
 
     /** 隔离方式 */
-    @Schema(description = "隔离方式")
+    @ApiModelProperty(value = "隔离方式")
     @Excel(name = "隔离方式")
     private String isolationMethod;
 
     /** 隔离点图标 */
-    @Schema(description = "隔离点图标")
+    @ApiModelProperty(value = "隔离点图标")
     @Excel(name = "隔离点图标")
     private String pointIcon;
 
     /** 隔离点图片 */
-    @Schema(description = "隔离点图片")
+    @ApiModelProperty(value = "隔离点图片")
     @Excel(name = "隔离点图片")
     private String pointPicture;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicket.java

@@ -3,7 +3,7 @@ package com.ktg.iscs.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,63 +22,63 @@ public class IsJobTicket extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 作业票ID */
-    @Schema(description = "作业票ID")
+    @ApiModelProperty(value = "作业票ID")
     private Long ticketId;
 
     /** 作业票编号 */
-    @Schema(description = "作业票编号")
+    @ApiModelProperty(value = "作业票编号")
     @Excel(name = "作业票编号")
     private String ticketCode;
 
     /** 作业票名称 */
-    @Schema(description = "作业票名称")
+    @ApiModelProperty(value = "作业票名称")
     @Excel(name = "作业票名称")
     private String ticketName;
 
     /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
     /** 所属区域ID */
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     @Excel(name = "所属区域ID")
     private Long workareaId;
 
     /** 所属SOPID */
-    @Schema(description = "所属SOPID")
+    @ApiModelProperty(value = "所属SOPID")
     @Excel(name = "所属SOPID")
     private Long sopId;
 
     /** 作业票类型 */
-    @Schema(description = "作业票类型")
+    @ApiModelProperty(value = "作业票类型")
     @Excel(name = "作业票类型")
     private String ticketType;
 
     /** 作业票详情 */
-    @Schema(description = "作业票详情")
+    @ApiModelProperty(value = "作业票详情")
     @Excel(name = "作业票详情")
     private String ticketContent;
 
     /** 作业票状态 */
-    @Schema(description = "作业票状态")
+    @ApiModelProperty(value = "作业票状态")
     @Excel(name = "作业票状态")
     private String ticketStatus;
 
     /** 作业票开始时间 */
-    @Schema(description = "作业票开始时间")
+    @ApiModelProperty(value = "作业票开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "作业票开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date ticketStartTime;
 
     /** 作业票结束时间 */
-    @Schema(description = "作业票结束时间")
+    @ApiModelProperty(value = "作业票结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "作业票结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date ticketEndTime;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketPoints.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 作业票隔离点对象 is_job_ticket_points
@@ -19,36 +19,36 @@ public class IsJobTicketPoints extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
-    @Schema(description = "记录ID")
+    @ApiModelProperty(value = "记录ID")
     private Long recordId;
 
     /** 作业票ID */
-    @Schema(description = "作业票ID")
+    @ApiModelProperty(value = "作业票ID")
     @Excel(name = "作业票ID")
     private Long ticketId;
 
     /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
     /** 所属区域ID */
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     @Excel(name = "所属区域ID")
     private Long workareaId;
 
     /** 隔离点ID */
-    @Schema(description = "隔离点ID")
+    @ApiModelProperty(value = "隔离点ID")
     @Excel(name = "隔离点ID")
     private Long pointId;
 
     /** 隔离点状态 */
-    @Schema(description = "隔离点状态")
+    @ApiModelProperty(value = "隔离点状态")
     @Excel(name = "隔离点状态")
     private String pointStatus;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicketUser.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 作业票用户对象 is_job_ticket_user
@@ -19,36 +19,36 @@ public class IsJobTicketUser extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
-    @Schema(description = "记录ID")
+    @ApiModelProperty(value = "记录ID")
     private Long recordId;
 
     /** 作业票ID */
-    @Schema(description = "作业票ID")
+    @ApiModelProperty(value = "作业票ID")
     @Excel(name = "作业票ID")
     private Long ticketId;
 
     /** 用户ID */
-    @Schema(description = "用户ID")
+    @ApiModelProperty(value = "用户ID")
     @Excel(name = "用户ID")
     private Long userId;
 
     /** 用户名称 */
-    @Schema(description = "用户名称")
+    @ApiModelProperty(value = "用户名称")
     @Excel(name = "用户名称")
     private String userName;
 
     /** 用户类型 */
-    @Schema(description = "用户类型")
+    @ApiModelProperty(value = "用户类型")
     @Excel(name = "用户类型")
     private String userType;
 
     /** 作业票角色 */
-    @Schema(description = "作业票角色")
+    @ApiModelProperty(value = "作业票角色")
     @Excel(name = "作业票角色")
     private String userRole;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsSop.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * SOP信息对象 is_sop
@@ -19,46 +19,46 @@ public class IsSop extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** SOP ID */
-    @Schema(description = "SOP ID")
+    @ApiModelProperty(value = "SOP ID")
     private Long sopId;
 
     /** SOP编号 */
-    @Schema(description = "SOP编号")
+    @ApiModelProperty(value = "SOP编号")
     @Excel(name = "SOP编号")
     private String sopCode;
 
     /** SOP名称 */
-    @Schema(description = "SOP名称")
+    @ApiModelProperty(value = "SOP名称")
     @Excel(name = "SOP名称")
     private String sopName;
 
     /** SOP类型 */
-    @Schema(description = "SOP类型")
+    @ApiModelProperty(value = "SOP类型")
     @Excel(name = "SOP类型")
     private String sopType;
 
     /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
     /** 所属区域ID */
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     @Excel(name = "所属区域ID")
     private Long workareaId;
 
     /** SOP内容 */
-    @Schema(description = "SOP内容")
+    @ApiModelProperty(value = "SOP内容")
     @Excel(name = "SOP内容")
     private String sopContent;
 
     /** SOP状态 */
-    @Schema(description = "SOP状态")
+    @ApiModelProperty(value = "SOP状态")
     @Excel(name = "SOP状态")
     private String sopStatus;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsSopPoints.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * SOP隔离点对象 is_sop_points
@@ -19,31 +19,31 @@ public class IsSopPoints extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 记录ID */
-    @Schema(description = "记录ID")
+    @ApiModelProperty(value = "记录ID")
     private Long recordId;
 
     /** SOPID */
-    @Schema(description = "SOPID")
+    @ApiModelProperty(value = "SOPID")
     @Excel(name = "SOPID")
     private Long sopId;
 
     /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
     /** 所属区域ID */
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     @Excel(name = "所属区域ID")
     private Long workareaId;
 
     /** 隔离点ID */
-    @Schema(description = "隔离点ID")
+    @ApiModelProperty(value = "隔离点ID")
     @Excel(name = "隔离点ID")
     private Long pointId;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsWorkarea.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 工作区域对象 is_workarea
@@ -19,36 +19,36 @@ public class IsWorkarea extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 区域ID */
-    @Schema(description = "区域ID")
+    @ApiModelProperty(value = "区域ID")
     private Long workareaId;
 
     /** 区域编号 */
-    @Schema(description = "区域编号")
+    @ApiModelProperty(value = "区域编号")
     @Excel(name = "区域编号")
     private String workareaCode;
 
     /** 区域名称 */
-    @Schema(description = "区域名称")
+    @ApiModelProperty(value = "区域名称")
     @Excel(name = "区域名称")
     private String workareaName;
 
     /** 区域类型 */
-    @Schema(description = "区域类型")
+    @ApiModelProperty(value = "区域类型")
     @Excel(name = "区域类型")
     private String workareaType;
 
     /** 所属车间ID */
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
     /** 地图 */
-    @Schema(description = "地图")
+    @ApiModelProperty(value = "地图")
     @Excel(name = "地图")
     private String map;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/hardware/GetListDTO.java

@@ -1,6 +1,6 @@
 package com.ktg.iscs.domain.dto.hardware;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,14 +12,13 @@ import lombok.Data;
 @Data
 public class GetListDTO {
 
-    @Schema(description = "硬件类型编码")
+    @ApiModelProperty(value = "硬件类型编码")
     private String hardwareTypeCode;
 
-    @Schema(description = "硬件类型名称")
+    @ApiModelProperty(value = "硬件类型名称")
     private String hardwareTypeName;
 
-
-    @Schema(description = "是否启用（Y-N）")
+    @ApiModelProperty(value = "是否启用（Y-N）")
     private String enableFlag;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/hardware/HardwareAutomaticDTO.java

@@ -1,6 +1,6 @@
 package com.ktg.iscs.domain.dto.hardware;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,16 +12,16 @@ import lombok.Data;
 @Data
 public class HardwareAutomaticDTO
 {
-    @Schema(description = "主键id")
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
-    @Schema(description = "硬件状态")
+    @ApiModelProperty(value = "硬件状态")
     private String status;
 
-    @Schema(description = "已用次数")
+    @ApiModelProperty(value = "已用次数")
     private Integer usedTimes;
 
-    @Schema(description = "已用寿命")
+    @ApiModelProperty(value = "已用寿命")
     private Integer usedLife;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/hardware/HardwarePageDTO.java

@@ -1,7 +1,7 @@
 package com.ktg.iscs.domain.dto.hardware;
 
 import com.ktg.common.annotation.Excel;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,31 +11,30 @@ import lombok.Data;
  * @date 2024-10-16
  */
 @Data
-public class HardwarePageDTO
-{
-    @Schema(description = "硬件编码")
+public class HardwarePageDTO {
+    @ApiModelProperty(value = "硬件编码")
     private String hardwareCode;
 
-    @Schema(description = "硬件名称")
+    @ApiModelProperty(value = "硬件名称")
     private String hardwareName;
 
-    @Schema(description = "规格型号")
+    @ApiModelProperty(value = "规格型号")
     private String hardwareSpec;
 
-    @Schema(description = "硬件类型ID")
+    @ApiModelProperty(value = "硬件类型ID")
     private Long hardwareTypeId;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     @Excel(name = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "硬件状态")
+    @ApiModelProperty(value = "硬件状态")
     private String status;
 
-    @Schema(description = "开始时间")
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
 
-    @Schema(description = "结束时间")
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/point/PagePointDTO.java

@@ -1,6 +1,6 @@
 package com.ktg.iscs.domain.dto.point;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,24 +13,24 @@ import lombok.Data;
 public class PagePointDTO
 {
 
-    @Schema(description = "隔离点编号")
+    @ApiModelProperty(value = "隔离点编号")
     private String pointCode;
 
-    @Schema(description = "隔离点名称")
+    @ApiModelProperty(value = "隔离点名称")
     private String pointName;
 
-    @Schema(description = "隔离点类型")
+    @ApiModelProperty(value = "隔离点类型")
     private String pointType;
 
-    @Schema(description = "危险能量类型")
+    @ApiModelProperty(value = "危险能量类型")
     private String powerType;
 
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-    @Schema(description = "开始时间")
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
 
-    @Schema(description = "结束时间")
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/sop/AddSopDTO.java

@@ -1,6 +1,6 @@
 package com.ktg.iscs.domain.dto.sop;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,28 +15,28 @@ import java.io.Serializable;
 public class AddSopDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "SOP ID")
+    @ApiModelProperty(value = "SOP ID")
     private Long sopId;
 
-    @Schema(description = "SOP编号")
+    @ApiModelProperty(value = "SOP编号")
     private String sopCode;
 
-    @Schema(description = "SOP名称")
+    @ApiModelProperty(value = "SOP名称")
     private String sopName;
 
-    @Schema(description = "SOP类型")
+    @ApiModelProperty(value = "SOP类型")
     private String sopType;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
-    @Schema(description = "SOP内容")
+    @ApiModelProperty(value = "SOP内容")
     private String sopContent;
 
-    @Schema(description = "隔离点id， 多个用逗号分隔")
+    @ApiModelProperty(value = "隔离点id， 多个用逗号分隔")
     private String pointIds;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/sop/PageSopDTO.java

@@ -1,6 +1,6 @@
 package com.ktg.iscs.domain.dto.sop;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,28 +15,28 @@ import java.io.Serializable;
 public class PageSopDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "SOP编号")
+    @ApiModelProperty(value = "SOP编号")
     private String sopCode;
 
-    @Schema(description = "SOP名称")
+    @ApiModelProperty(value = "SOP名称")
     private String sopName;
 
-    @Schema(description = "SOP状态")
+    @ApiModelProperty(value = "SOP状态")
     private String sopStatus;
 
-    @Schema(description = "SOP类型")
+    @ApiModelProperty(value = "SOP类型")
     private String sopType;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
-    @Schema(description = "开始时间")
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
 
-    @Schema(description = "结束时间")
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/ticket/AddJobTicketDTO.java

@@ -1,7 +1,7 @@
 package com.ktg.iscs.domain.dto.ticket;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,45 +17,45 @@ import java.util.List;
 public class AddJobTicketDTO
 {
 
-    @Schema(description = "作业票ID")
+    @ApiModelProperty(value = "作业票ID")
     private Long ticketId;
 
-    @Schema(description = "作业票编号")
+    @ApiModelProperty(value = "作业票编号")
     private String ticketCode;
 
-    @Schema(description = "作业票名称")
+    @ApiModelProperty(value = "作业票名称")
     private String ticketName;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
-    @Schema(description = "所属SOPID")
+    @ApiModelProperty(value = "所属SOPID")
     private Long sopId;
 
-    @Schema(description = "作业票类型")
+    @ApiModelProperty(value = "作业票类型")
     private String ticketType;
 
-    @Schema(description = "作业票详情")
+    @ApiModelProperty(value = "作业票详情")
     private String ticketContent;
 
-    @Schema(description = "作业票状态")
+    @ApiModelProperty(value = "作业票状态")
     private String ticketStatus;
 
-    @Schema(description = "作业票开始时间")
+    @ApiModelProperty(value = "作业票开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ticketStartTime;
 
-    @Schema(description = "作业票结束时间")
+    @ApiModelProperty(value = "作业票结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ticketEndTime;
 
-    @Schema(description = "隔离点id， 多个用逗号分隔")
+    @ApiModelProperty(value = "隔离点id， 多个用逗号分隔")
     private String pointIds;
 
-    @Schema(description = "关联人员信息")
+    @ApiModelProperty(value = "关联人员信息")
     private List<AddTicketUserDTO> ticketUserDTOList;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/ticket/AddTicketUserDTO.java

@@ -1,6 +1,6 @@
 package com.ktg.iscs.domain.dto.ticket;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,16 +13,16 @@ import lombok.Data;
 public class AddTicketUserDTO
 {
 
-    @Schema(description = "用户ID")
+    @ApiModelProperty(value = "用户ID")
     private Long userId;
 
-    @Schema(description = "用户名称")
+    @ApiModelProperty(value = "用户名称")
     private String userName;
 
-    @Schema(description = "用户类型")
+    @ApiModelProperty(value = "用户类型")
     private String userType;
 
-    @Schema(description = "作业票角色")
+    @ApiModelProperty(value = "作业票角色")
     private String userRole;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/hardware/IsHardwareTypeVO.java

@@ -2,7 +2,7 @@ package com.ktg.iscs.domain.vo.hardware;
 
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,36 +19,36 @@ public class IsHardwareTypeVO extends BaseBean
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
-    @Schema(description = "主键id")
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
     /** 硬件类型编码 */
-    @Schema(description = "硬件类型编码")
+    @ApiModelProperty(value = "硬件类型编码")
     @Excel(name = "硬件类型编码")
     private String hardwareTypeCode;
 
     /** 硬件类型名称 */
-    @Schema(description = "硬件类型名称")
+    @ApiModelProperty(value = "硬件类型名称")
     @Excel(name = "硬件类型名称")
     private String hardwareTypeName;
 
     /** 父类型ID */
-    @Schema(description = "父类型ID")
+    @ApiModelProperty(value = "父类型ID")
     @Excel(name = "父类型ID")
     private Long parentTypeId;
 
     /** 所有父节点ID */
-    @Schema(description = "所有父节点ID")
+    @ApiModelProperty(value = "所有父节点ID")
     @Excel(name = "所有父节点ID")
     private String ancestors;
 
     /** 是否启用 */
-    @Schema(description = "是否启用（Y-N）")
+    @ApiModelProperty(value = "是否启用（Y-N）")
     @Excel(name = "是否启用")
     private String enableFlag;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -1,7 +1,7 @@
 package com.ktg.iscs.domain.vo.points;
 
 import com.ktg.common.core.domain.model.BaseBean;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,37 +17,37 @@ public class PointDetailVO extends BaseBean
 {
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "隔离点ID")
+    @ApiModelProperty(value = "隔离点ID")
     private Long pointId;
 
-    @Schema(description = "隔离点编号")
+    @ApiModelProperty(value = "隔离点编号")
     private String pointCode;
 
-    @Schema(description = "隔离点名称")
+    @ApiModelProperty(value = "隔离点名称")
     private String pointName;
 
-    @Schema(description = "隔离点类型")
+    @ApiModelProperty(value = "隔离点类型")
     private String pointType;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
-    @Schema(description = "危险能量类型")
+    @ApiModelProperty(value = "危险能量类型")
     private String powerType;
 
-    @Schema(description = "隔离方式")
+    @ApiModelProperty(value = "隔离方式")
     private String isolationMethod;
 
-    @Schema(description = "隔离点图标")
+    @ApiModelProperty(value = "隔离点图标")
     private String pointIcon;
 
-    @Schema(description = "隔离点图片")
+    @ApiModelProperty(value = "隔离点图片")
     private String pointPicture;
 
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/sop/SopDetailVO.java

@@ -2,7 +2,7 @@ package com.ktg.iscs.domain.vo.sop;
 
 import com.ktg.common.core.domain.model.BaseBean;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,34 +20,34 @@ public class SopDetailVO extends BaseBean
 {
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "SOP ID")
+    @ApiModelProperty(value = "SOP ID")
     private Long sopId;
 
-    @Schema(description = "SOP编号")
+    @ApiModelProperty(value = "SOP编号")
     private String sopCode;
 
-    @Schema(description = "SOP名称")
+    @ApiModelProperty(value = "SOP名称")
     private String sopName;
 
-    @Schema(description = "SOP类型")
+    @ApiModelProperty(value = "SOP类型")
     private String sopType;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
-    @Schema(description = "SOP内容")
+    @ApiModelProperty(value = "SOP内容")
     private String sopContent;
 
-    @Schema(description = "SOP状态")
+    @ApiModelProperty(value = "SOP状态")
     private String sopStatus;
 
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-   @Schema(description = "隔离点数据")
+   @ApiModelProperty(value = "隔离点数据")
    private List<PointDetailVO>  pointDetailVOList;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/sop/SopPageVO.java

@@ -0,0 +1,53 @@
+package com.ktg.iscs.domain.vo.sop;
+
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * SOP信息对象 is_sop
+ *
+ * @author cgj
+ * @date 2024-10-18
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SopPageVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "SOP ID")
+    private Long sopId;
+
+    @ApiModelProperty(value = "SOP编号")
+    private String sopCode;
+
+    @ApiModelProperty(value = "SOP名称")
+    private String sopName;
+
+    @ApiModelProperty(value = "SOP类型")
+    private String sopType;
+
+    @ApiModelProperty(value = "所属车间ID")
+    private Long workshopId;
+
+    @ApiModelProperty(value = "所属车间Name")
+    private String workshopName;
+
+    @ApiModelProperty(value = "所属区域ID")
+    private Long workareaId;
+
+    @ApiModelProperty(value = "所属区域Name")
+    private String workareaName;
+
+    @ApiModelProperty(value = "SOP内容")
+    private String sopContent;
+
+    @ApiModelProperty(value = "SOP状态")
+    private String sopStatus;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/ticket/JobTicketDetailVO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.core.domain.model.BaseBean;
 import com.ktg.iscs.domain.IsJobTicketUser;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -23,48 +23,48 @@ public class JobTicketDetailVO extends BaseBean
 {
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "作业票ID")
+    @ApiModelProperty(value = "作业票ID")
     private Long ticketId;
 
-    @Schema(description = "作业票编号")
+    @ApiModelProperty(value = "作业票编号")
     private String ticketCode;
 
-    @Schema(description = "作业票名称")
+    @ApiModelProperty(value = "作业票名称")
     private String ticketName;
 
-    @Schema(description = "所属车间ID")
+    @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
-    @Schema(description = "所属区域ID")
+    @ApiModelProperty(value = "所属区域ID")
     private Long workareaId;
 
-    @Schema(description = "所属SOPID")
+    @ApiModelProperty(value = "所属SOPID")
     private Long sopId;
 
-    @Schema(description = "作业票类型")
+    @ApiModelProperty(value = "作业票类型")
     private String ticketType;
 
-    @Schema(description = "作业票详情")
+    @ApiModelProperty(value = "作业票详情")
     private String ticketContent;
 
-    @Schema(description = "作业票状态")
+    @ApiModelProperty(value = "作业票状态")
     private String ticketStatus;
 
-    @Schema(description = "作业票开始时间")
+    @ApiModelProperty(value = "作业票开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ticketStartTime;
 
-    @Schema(description = "作业票结束时间")
+    @ApiModelProperty(value = "作业票结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ticketEndTime;
 
-    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-    @Schema(description = "隔离点数据")
+    @ApiModelProperty(value = "隔离点数据")
     private List<PointDetailVO> pointDetailVOList;
 
-    @Schema(description = "人员数据")
+    @ApiModelProperty(value = "人员数据")
     private List<IsJobTicketUser> jobTicketUserList;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsSopMapper.java

@@ -1,8 +1,12 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsSop;
+import com.ktg.iscs.domain.dto.sop.PageSopDTO;
+import com.ktg.iscs.domain.vo.sop.SopPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +66,12 @@ public interface IsSopMapper extends BaseMapperX<IsSop>
      * @return 结果
      */
     int deleteIsSopBySopIds(Long[] sopIds);
+
+    /**
+     * sop分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<SopPageVO> getIsSopPage(Page<IsSop> page, @Param(value = "dto") PageSopDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsSopService.java

@@ -1,9 +1,12 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsSop;
 import com.ktg.iscs.domain.dto.sop.AddSopDTO;
+import com.ktg.iscs.domain.dto.sop.PageSopDTO;
 import com.ktg.iscs.domain.vo.sop.SopDetailVO;
+import com.ktg.iscs.domain.vo.sop.SopPageVO;
 
 import java.util.List;
 
@@ -62,4 +65,12 @@ public interface IIsSopService extends IService<IsSop>
      * @return 结果
      */
     int deleteIsSopBySopId(Long sopId);
+
+    /**
+     * sop分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<SopPageVO> getIsSopPage(Page<IsSop> page, PageSopDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSopServiceImpl.java

@@ -2,6 +2,7 @@ package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.bean.BeanUtils;
@@ -9,8 +10,10 @@ import com.ktg.iscs.domain.IsIsolationPoint;
 import com.ktg.iscs.domain.IsSop;
 import com.ktg.iscs.domain.IsSopPoints;
 import com.ktg.iscs.domain.dto.sop.AddSopDTO;
+import com.ktg.iscs.domain.dto.sop.PageSopDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import com.ktg.iscs.domain.vo.sop.SopDetailVO;
+import com.ktg.iscs.domain.vo.sop.SopPageVO;
 import com.ktg.iscs.mapper.IsSopMapper;
 import com.ktg.iscs.service.IIsIsolationPointService;
 import com.ktg.iscs.service.IIsSopPointsService;
@@ -176,4 +179,19 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
         return isSopMapper.deleteIsSopBySopId(sopId);
     }
 
+    @Override
+    public Page<SopPageVO> getIsSopPage(Page<IsSop> page, PageSopDTO dto) {
+        /*Page<IsSop> result = page(page, Wrappers.<IsSop>lambdaQuery()
+                .like(StringUtils.isNotBlank(dto.getSopCode()), IsSop::getSopCode, dto.getSopCode())
+                .like(StringUtils.isNotBlank(dto.getSopName()), IsSop::getSopName, dto.getSopName())
+                .eq(StringUtils.isNotBlank(dto.getSopStatus()), IsSop::getSopStatus, dto.getSopStatus())
+                .eq(dto.getWorkshopId() != null, IsSop::getWorkshopId, dto.getWorkshopId())
+                .eq(dto.getWorkareaId() != null, IsSop::getWorkareaId, dto.getWorkareaId())
+                .eq(StringUtils.isNotBlank(dto.getSopType()), IsSop::getSopType, dto.getSopType())
+                .ge(StringUtils.isNotBlank(dto.getStartTime()), IsSop::getCreateTime, dto.getStartTime())
+                .le(StringUtils.isNotBlank(dto.getEndTime()), IsSop::getCreateTime, dto.getEndTime())
+                .orderByDesc(IsSop::getSopId));*/
+        return isSopMapper.getIsSopPage(page, dto);
+    }
+
 }

ktg-iscs/src/main/resources/mapper/IsSopMapper.xml

@@ -103,4 +103,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{sopId}
         </foreach>
     </delete>
+
+    <select id="getIsSopPage" resultType="com.ktg.iscs.domain.vo.sop.SopPageVO">
+        SELECT
+            s.*,
+            ws.workshop_name,
+            wa.workarea_name
+        FROM
+            is_sop s
+            LEFT JOIN md_workshop ws ON ws.workshop_id = s.workshop_id
+            LEFT JOIN is_workarea wa ON wa.workarea_id = s.workarea_id
+        <where>
+            <if test="dto.sopCode != null and dto.sopCode.trim != ''">
+                and s.sop_code like concat('%',#{dto.sopCode},'%')
+            </if>
+            <if test="dto.sopName != null and dto.sopName.trim != ''">
+                and s.sop_name like concat('%',#{dto.sopName},'%')
+            </if>
+            <if test="dto.sopStatus != null and dto.sopStatus.trim != ''">
+                and s.sop_status = #{dto.sopStatus}
+            </if>
+            <if test="dto.workshopId != null">
+                and s.workshop_id = #{dto.workshopId}
+            </if>
+            <if test="dto.workareaId != null">
+                and s.workarea_id = #{dto.workareaId}
+            </if>
+            <if test="dto.sopType != null and dto.sopType.trim != ''">
+                and s.sop_type = #{dto.sopType}
+            </if>
+            <if test="dto.startTime != null and dto.startTime.trim != ''">
+                and s.create_time &gt;= #{dto.startTime}
+            </if>
+            <if test="dto.endTime != null and dto.endTime.trim != ''">
+                and s.create_time &lt;= #{dto.endTime}
+            </if>
+        </where>
+        order by s.sop_id desc
+    </select>
+
 </mapper>