diff --git a/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java index 0664380..405016d 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java @@ -1,16 +1,19 @@ package com.dite.znpt.domain.entity; -import java.time.LocalDateTime; -import java.io.Serializable; - import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.dite.znpt.domain.AuditableEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** * @author sakura * @date 2025/04/10 13:35 @@ -36,8 +39,8 @@ public class TConstructionEntity extends AuditableEntity implements Serializable @ExcelProperty("机组id") @ApiModelProperty("机组id") - @TableField("turbine_code") - private String turbineCode; + @TableField("turbine_id") + private String turbineId; @ExcelProperty("作业开始时间") @ApiModelProperty("作业开始时间") diff --git a/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java index cf9c96a..6176d92 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java @@ -1,13 +1,13 @@ package com.dite.znpt.domain.vo; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * @author huise23 * @date 2025/04/24 13:44 @@ -29,7 +29,7 @@ public class TConstructionListReq implements Serializable { private String projectId; @ApiModelProperty("机组id") - private String turbineCode; + private String turbineId; @ApiModelProperty("作业开始时间") private LocalDateTime startTime; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/TConstructionReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionReq.java index 04dc591..06aefc1 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/TConstructionReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionReq.java @@ -28,7 +28,7 @@ public class TConstructionReq implements Serializable { private String projectId; @ApiModelProperty("机组id") - private String turbineCode; + private String turbineId; @ApiModelProperty("作业开始时间") private LocalDateTime startTime; diff --git a/core/src/main/resources/mapper/TConstructionMapper.xml b/core/src/main/resources/mapper/TConstructionMapper.xml index 423b98d..a70371f 100644 --- a/core/src/main/resources/mapper/TConstructionMapper.xml +++ b/core/src/main/resources/mapper/TConstructionMapper.xml @@ -3,7 +3,7 @@ - a.construction_id, a.project_id, a.turbine_code, a.start_time, + a.construction_id, a.project_id, a.turbine_id, a.start_time, a.end_time, a.temperature, a.wind_speed, a.image_count, a.weather_code, a.status_id, a.created_at @@ -22,8 +22,8 @@ and a.project_id like concat ('%', #{projectId}, '%') - - and a.turbine_code like concat ('%', #{turbineCode}, '%') + + and a.turbine_id like concat ('%', #{turbineId}, '%') and a.start_time = #{startTime}