Commit 2f3437b6 authored by 史志龙's avatar 史志龙

Merge branch 'dev-szl' into 'dev'

钢轨波磨情况检查数据接口更新 -shizhilong

See merge request !52
parents 0d9027e1 dea3bee0
package org.jeecg.modules.checkData.equipmentCheckData.dto; package org.jeecg.modules.checkData.equipmentCheckData.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -81,12 +77,15 @@ public class RecordsMasterCheckDTO { ...@@ -81,12 +77,15 @@ public class RecordsMasterCheckDTO {
@ApiModelProperty("终点里程") @ApiModelProperty("终点里程")
private BigDecimal endMileage; private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)") @ApiModelProperty("共通字段1(根据字段type来赋值)->(线路方向)")
private String numOne; private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)") @ApiModelProperty("共通字段2(根据字段type来赋值)->(推行方向)")
private String numTwo; private String numTwo;
@ApiModelProperty("共通字段3(根据字段type来赋值)->(检查时间)")
private String numThree;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
......
...@@ -15,7 +15,6 @@ import lombok.Getter; ...@@ -15,7 +15,6 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.jeecg.modules.utils.ExcelExport; import org.jeecg.modules.utils.ExcelExport;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/** /**
* <p> * <p>
...@@ -116,14 +115,18 @@ public class RecordsMasterCheck implements Serializable { ...@@ -116,14 +115,18 @@ public class RecordsMasterCheck implements Serializable {
@ExcelExport(value = "终点里程", sort = 8) @ExcelExport(value = "终点里程", sort = 8)
private BigDecimal endMileage; private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)") @ApiModelProperty("共通字段1(根据字段type来赋值)->(线路方向)")
@TableField("num_one") @TableField("num_one")
private String numOne; private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)") @ApiModelProperty("共通字段2(根据字段type来赋值)->(推行方向)")
@TableField("num_two") @TableField("num_two")
private String numTwo; private String numTwo;
@ApiModelProperty("共通字段3(根据字段type来赋值)->(检查时间)")
@TableField("num_three")
private String numThree;
@ApiModelProperty("备注") @ApiModelProperty("备注")
@TableField("remark") @TableField("remark")
@ExcelExport(value = "备注", sort = 13) @ExcelExport(value = "备注", sort = 13)
......
...@@ -77,12 +77,15 @@ public class RecordsMasterCheckVO { ...@@ -77,12 +77,15 @@ public class RecordsMasterCheckVO {
@ApiModelProperty("终点里程") @ApiModelProperty("终点里程")
private BigDecimal endMileage; private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)") @ApiModelProperty("共通字段1(根据字段type来赋值)->(线路方向)")
private String numOne; private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)") @ApiModelProperty("共通字段2(根据字段type来赋值)->(推行方向)")
private String numTwo; private String numTwo;
@ApiModelProperty("共通字段3(根据字段type来赋值)->(检查时间)")
private String numThree;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment