需求6（检查数据库-设备检查记录数据-钢轨常规探伤记录，目前填报的字段用户发生了变更，修改为类似于线路巡查进行填报的方式。）提交--shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/entity/RailWearRecord.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModel;
@@ -52,10 +53,6 @@ public class RailWearRecord implements Serializable {
     @TableField("records_master_check_id")
     private String recordsMasterCheckId;
 
-    @ApiModelProperty("钢轨轨型")
-    @TableField("rail_type")
-    private String railType;
-
     @ApiModelProperty("线别Id")
     @TableField("line_alias_id")
     private String lineAliasId;
@@ -64,33 +61,75 @@ public class RailWearRecord implements Serializable {
     @TableField("line_alias_name")
     private String lineAliasName;
 
-    @ApiModelProperty("左股仪器编码")
+    @ApiModelProperty("检查设备id")
+    @TableField("device_project_id")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备code")
+    @TableField("device_project_code")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    @TableField("device_project_type")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("股别(1-左股，2-右股)")
+    @TableField("damage_level")
+    private Integer damageLevel;
+
+    @ApiModelProperty("伤损钢轨数量")
+    @TableField("damage_num")
+    private Integer damageNum;
+
+
+    @ApiModelProperty("伤损里程")
+    @TableField("damage_mileage")
+    private BigDecimal damageMileage;
+
+    @ApiModelProperty("伤损种类（1-鱼鳞纹,2-剥落掉块,3-表面疲劳裂纹,4-轨底掉块,5-灼伤,6-核伤,7-焊缝,8-其他）")
+    @TableField("damage_type")
+    private Integer damageType;
+
+    @ApiModelProperty("伤损程度(1-轻伤,2-轻伤有发展,3-重伤)")
+    @TableField("damage_degree")
+    private Integer damageDegree;
+
+    @ApiModelProperty("换轨计划")
+    @TableField("damage_plan")
+    private String damagePlan;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+
+    //***********************作废字段****************************************
+    @ApiModelProperty("左股仪器编码-作废")
     @TableField("left_femoral_apparatus_code")
     private String leftFemoralApparatusCode;
 
-    @ApiModelProperty("左股仪器")
+    @ApiModelProperty("左股仪器-作废")
     @TableField("left_femoral_apparatus")
     private String leftFemoralApparatus;
 
-    @ApiModelProperty("左股轨向")
+    @ApiModelProperty("左股轨向-作废")
     @TableField("left_track_direction")
     private String leftTrackDirection;
 
-    @ApiModelProperty("右股仪器编码")
+    @ApiModelProperty("右股仪器编码-作废")
     @TableField("right_femoral_apparatus_code")
     private String rightFemoralApparatusCode;
 
-    @ApiModelProperty("右股仪器")
+    @ApiModelProperty("右股仪器-作废")
     @TableField("right_femoral_apparatus")
     private String rightFemoralApparatus;
 
-    @ApiModelProperty("右股轨向")
+    @ApiModelProperty("右股轨向-作废")
     @TableField("right_track_direction")
     private String rightTrackDirection;
 
-    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
-    @TableField("del_flag")
-    private String delFlag;
-
-
+    @ApiModelProperty("钢轨轨型-作废")
+    @TableField("rail_type")
+    private String railType;
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/RailWearRecordMapper.xml

@@ -20,7 +20,6 @@
             t2.line_alias_name,
             t2.starting_mileage,
             t2.end_mileage,
-            t1.rail_type,
             t2.remark
         FROM
             t_ek_rail_wear_record t1
@@ -39,13 +38,7 @@
     <select id="getDetail"
             resultType="org.jeecg.modules.checkData.vo.RailWearRecordDetailVO">
         SELECT
-            t1.id,
-            t1.left_femoral_apparatus_code,
-            t1.left_femoral_apparatus,
-            t1.right_femoral_apparatus_code,
-            t1.right_femoral_apparatus,
-            t1.left_track_direction,
-            t1.right_track_direction
+            t1.*
         FROM
             t_ek_rail_wear_record t1
         where t1.id = #{id}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/RailWearRecordDetailVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -23,24 +24,31 @@ public class RailWearRecordDetailVO {
     @ApiModelProperty("主键")
     private String id;
 
-    @ApiModelProperty("左股仪器编码")
-    private String leftFemoralApparatusCode;
+    @ApiModelProperty("检查设备id")
+    private String deviceProjectId;
 
-    @ApiModelProperty("左股仪器")
-    private String leftFemoralApparatus;
+    @ApiModelProperty("检查设备code")
+    private String deviceProjectCode;
 
-    @ApiModelProperty("右股仪器编码")
-    private String rightFemoralApparatusCode;
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
 
-    @ApiModelProperty("右股仪器")
-    private String rightFemoralApparatus;
+    @ApiModelProperty("股别(1-左股，2-右股)")
+    private Integer damageLevel;
 
-    @ApiModelProperty("左股轨向")
-    @TableField("left_track_direction")
-    private String leftTrackDirection;
+    @ApiModelProperty("伤损钢轨数量")
+    private Integer damageNum;
 
-    @ApiModelProperty("右股轨向")
-    @TableField("right_track_direction")
-    private String rightTrackDirection;
+    @ApiModelProperty("伤损里程")
+    private BigDecimal damageMileage;
 
+    @ApiModelProperty("伤损种类（1-鱼鳞纹,2-剥落掉块,3-表面疲劳裂纹,4-轨底掉块,5-灼伤,6-核伤,7-焊缝,8-其他）")
+    private Integer damageType;
+
+    @ApiModelProperty("伤损程度(1-轻伤,2-轻伤有发展,3-重伤)")
+    private Integer damageDegree;
+
+    @ApiModelProperty("换轨计划")
+    @TableField("damage_plan")
+    private Integer damagePlan;
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/RailWearRecordVO.java

@@ -89,6 +89,4 @@ public class RailWearRecordVO {
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("钢轨轨型")
-    private String railType;
 }