From 7e4f36a5cc7a067295db39e602b7d1b4eb66f7e7 Mon Sep 17 00:00:00 2001 From: Penknife Date: Thu, 16 Jan 2025 17:24:05 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E8=A1=A5=E5=85=85=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fizz/business/domain/ProStoppage.java | 16 +++++++++++++++- .../service/impl/ProStoppageServiceImpl.java | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/fizz/business/domain/ProStoppage.java b/business/src/main/java/com/fizz/business/domain/ProStoppage.java index 89dedbc..8046e67 100644 --- a/business/src/main/java/com/fizz/business/domain/ProStoppage.java +++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java @@ -2,6 +2,7 @@ package com.fizz.business.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,30 +16,43 @@ public class ProStoppage implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "停机ID") + private Long stopid; + @ApiModelProperty(value = "钢卷号") private String coilid; + @ApiModelProperty(value = "班") private String shift; - + @ApiModelProperty(value = "组") private String crew; + @ApiModelProperty(value = "区域") private String area; + @ApiModelProperty(value = "机组") private String unit; + @ApiModelProperty(value = "设备") private String seton; + @ApiModelProperty(value = "开始时间") private LocalDateTime startDate; + @ApiModelProperty(value = "结束时间") private LocalDateTime endDate; + @ApiModelProperty(value = "停机时长") private Float duration; + @ApiModelProperty(value = "更新时间") private String insdate; + @ApiModelProperty(value = "停机类型") private String stopType; + @ApiModelProperty(value = "停机原因") private String remark; } diff --git a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java index 53d1e19..ba6a9b4 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java @@ -19,8 +19,8 @@ public class ProStoppageServiceImpl extends ServiceImpl listAll(ProStoppageForm form) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00"); - queryWrapper.le("start_date", form.getEndDate() + " 23:59:59"); + queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00"); + queryWrapper.le("end_date", form.getEndDate() + " 23:59:59"); return baseMapper.selectList(queryWrapper); }