cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.施工信息问题修复

This commit is contained in:
cuizhibin 2025-07-03 16:40:24 +08:00
parent 8788c6f7e4
commit 09064b201d
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java
View File

@ -1,16 +1,19 @@
package com.dite.znpt.domain.entity; package com.dite.znpt.domain.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import com.alibaba.excel.annotation.ExcelProperty; 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 com.dite.znpt.domain.AuditableEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* @author sakura * @author sakura
* @date 2025/04/10 13:35 * @date 2025/04/10 13:35
@ -36,8 +39,8 @@ public class TConstructionEntity extends AuditableEntity implements Serializable
@ExcelProperty("机组id") @ExcelProperty("机组id")
@ApiModelProperty("机组id") @ApiModelProperty("机组id")
@TableField("turbine_code") @TableField("turbine_id")
private String turbineCode; private String turbineId;
@ExcelProperty("作业开始时间") @ExcelProperty("作业开始时间")
@ApiModelProperty("作业开始时间") @ApiModelProperty("作业开始时间")

10
core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java
View File

@ -1,13 +1,13 @@
package com.dite.znpt.domain.vo; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/** /**
* @author huise23 * @author huise23
* @date 2025/04/24 13:44 * @date 2025/04/24 13:44
@ -29,7 +29,7 @@ public class TConstructionListReq implements Serializable {
private String projectId; private String projectId;
@ApiModelProperty("机组id") @ApiModelProperty("机组id")
private String turbineCode; private String turbineId;
@ApiModelProperty("作业开始时间") @ApiModelProperty("作业开始时间")
private LocalDateTime startTime; private LocalDateTime startTime;

2
core/src/main/java/com/dite/znpt/domain/vo/TConstructionReq.java
View File

@ -28,7 +28,7 @@ public class TConstructionReq implements Serializable {
private String projectId; private String projectId;
@ApiModelProperty("机组id") @ApiModelProperty("机组id")
private String turbineCode; private String turbineId;
@ApiModelProperty("作业开始时间") @ApiModelProperty("作业开始时间")
private LocalDateTime startTime; private LocalDateTime startTime;

6
core/src/main/resources/mapper/TConstructionMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.dite.znpt.mapper.TConstructionMapper"> <mapper namespace="com.dite.znpt.mapper.TConstructionMapper">
<sql id="Base_Column_List"> <sql id="Base_Column_List">
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.end_time, a.temperature, a.wind_speed, a.image_count,
a.weather_code, a.status_id, a.created_at a.weather_code, a.status_id, a.created_at
</sql> </sql>
@ -22,8 +22,8 @@
<if test="projectId != null and projectId != ''"> <if test="projectId != null and projectId != ''">
and a.project_id like concat ('%', #{projectId}, '%') and a.project_id like concat ('%', #{projectId}, '%')
</if> </if>
<if test="turbineCode != null and turbineCode != ''"> <if test="turbineId != null and turbineId != ''">
and a.turbine_code like concat ('%', #{turbineCode}, '%') and a.turbine_id like concat ('%', #{turbineId}, '%')
</if> </if>
<if test="startTime != null"> <if test="startTime != null">
and a.start_time = #{startTime} and a.start_time = #{startTime}