diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java index e4b42653c..9189e1ce6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java @@ -47,6 +47,9 @@ public class TaskPageReqVO extends PageParam { @Schema(description = "备注", example = "你猜") private String remark; + @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") + private String fileUrl; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java index e3a7dea10..b64bef3e6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java @@ -65,6 +65,10 @@ public class TaskRespVO { @ExcelProperty("备注") private String remark; + @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") + @ExcelProperty("附件 URL") + private String fileUrl; + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty(value = "是否启用", converter = DictConvert.class) @DictFormat("infra_boolean_string") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java index 4be065de1..d69f4c992 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java @@ -50,6 +50,9 @@ public class TaskSaveReqVO { @Schema(description = "备注", example = "你猜") private String remark; + @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") + private String fileUrl; + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean isEnable; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java index aa91d3a54..a41081aa2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java @@ -68,6 +68,11 @@ public class TaskDO extends BaseDO { */ private String remark; + /** + * 附件 URL + */ + private String fileUrl; + /** * 是否急单0-否 1-是 */ diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java index 33e8fb83d..34382fc06 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java @@ -33,6 +33,7 @@ public interface TaskMapper extends BaseMapperX { .eqIfPresent(TaskDO::getStatus, reqVO.getStatus()) .eqIfPresent(TaskDO::getProcessInstanceId, reqVO.getProcessInstanceId()) .eqIfPresent(TaskDO::getRemark, reqVO.getRemark()) + .likeIfPresent(TaskDO::getFileUrl, reqVO.getFileUrl()) .eqIfPresent(TaskDO::getTaskType, reqVO.getTaskType()) .betweenIfPresent(TaskDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TaskDO::getId)); @@ -54,6 +55,7 @@ public interface TaskMapper extends BaseMapperX { .eqIfPresent(TaskDO::getIsScheduled, reqVO.getIsScheduled()) .eqIfPresent(TaskDO::getProcessInstanceId, reqVO.getProcessInstanceId()) .eqIfPresent(TaskDO::getRemark, reqVO.getRemark()) + .likeIfPresent(TaskDO::getFileUrl, reqVO.getFileUrl()) .betweenIfPresent(TaskDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TaskDO::getId)); }