道岔使用情况检查数据类初始化 -shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/RecordsMasterCheckController.java

@@ -145,6 +145,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
                 .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionId()), RecordsMasterCheck::getSubwaySectionId, recordsMasterCheck.getSubwaySectionId())
                 .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailId()), RecordsMasterCheck::getLightRailId, recordsMasterCheck.getLightRailId())
                 .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getLineAliasId, recordsMasterCheck.getLineAliasId())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getType, recordsMasterCheck.getType())
                 .orderByAsc(RecordsMasterCheck::getCreateTime));
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "道床使用情况检查");
@@ -168,6 +169,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
                 .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionId()), RecordsMasterCheck::getSubwaySectionId, recordsMasterCheck.getSubwaySectionId())
                 .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailId()), RecordsMasterCheck::getLightRailId, recordsMasterCheck.getLightRailId())
                 .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getLineAliasId, recordsMasterCheck.getLineAliasId())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getType, recordsMasterCheck.getType())
                 .orderByAsc(RecordsMasterCheck::getCreateTime));
         int num = 0;
         for (RecordsMasterCheck s : resultList) {

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterCheckDTO.java

 package org.jeecg.modules.checkData.equipmentCheckData.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,18 +33,21 @@ public class RecordsMasterCheckDTO {
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @ApiModelProperty("更新人")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @ApiModelProperty("设备检查类型（1：道岔使用情况；2：钢轨伤损情况；3：曲线磨损情况；4：钢轨波磨情况；5：道床使用情况）")
+    private String type;
+
     @ApiModelProperty("检查批次编号")
     private String ekCode;
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterTurnoutInfoDTO.java

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查数据设备-设备检查记录数据-道岔使用情况检查数据
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-01
+ */
+@Data
+public class RecordsMasterTurnoutInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty("设备检查记录主表id")
+    private String recordsMasterId;
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
+    private String type;
+
+    @ApiModelProperty("值1")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    private String numSix;
+
+
+    @ApiModelProperty("值7")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+}

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

@@ -45,8 +45,8 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -55,12 +55,15 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    @ExcelExport(value = "检查批次编号", sort = 2)
-    //@Excel(name = "检查批次编号", width = 15, orderNum = "1")
+    @ApiModelProperty("设备检查类型（1：道岔使用情况；2：钢轨伤损情况；3：曲线磨损情况；4：钢轨波磨情况；5：道床使用情况）")
+    @TableField("type")
+    private String type;
+
+    @ExcelExport(value = "检查d批次编号", sort = 2)
     @ApiModelProperty("检查批次编号")
     @TableField("ek_code")
     private String ekCode;
@@ -68,9 +71,12 @@ public class RecordsMasterCheck implements Serializable {
     @ExcelExport(value = "工单编号", sort = 3)
     @ApiModelProperty("工单编号")
     @TableField("work_code")
-    //@Excel(name = "工单编号", width = 15, orderNum = "2")
     private String workCode;
 
+    @ApiModelProperty("轨距水平尺编号")
+    @TableField("gauge_code")
+    private String gaugeCode;
+
     @ApiModelProperty("检查区间id")
     @TableField("subway_section_id")
     private String subwaySectionId;
@@ -78,7 +84,6 @@ public class RecordsMasterCheck implements Serializable {
     @ApiModelProperty("检查区间名称")
     @TableField("subway_section_name")
     @ExcelExport(value = "检查区间名称", sort = 4)
-   // @Excel(name = "检查区间", width = 15, orderNum = "3")
     private String subwaySectionName;
 
     @ApiModelProperty("所属线路id")
@@ -88,7 +93,6 @@ public class RecordsMasterCheck implements Serializable {
     @ApiModelProperty("所属线路名称")
     @TableField("light_rail_name")
     @ExcelExport(value = "所属线路", sort = 5)
-    //@Excel(name = "所属线路", width = 15, orderNum = "4")
     private String lightRailName;
 
     @ApiModelProperty("所属线别id")
@@ -98,42 +102,35 @@ public class RecordsMasterCheck implements Serializable {
     @ApiModelProperty("所属线别名称")
     @TableField("line_alias_name")
     @ExcelExport(value = "所属线别", sort = 6)
-    //@Excel(name = "所属线别", width = 15, orderNum = "5")
     private String lineAliasName;
 
     @ApiModelProperty("起始里程")
     @TableField("starting_mileage")
-    //@Excel(name = "起始里程", width = 15, orderNum = "6")
     @ExcelExport(value = "起始里程", sort = 7)
     private BigDecimal startingMileage;
 
     @ApiModelProperty("终点里程")
     @TableField("end_mileage")
-    //@Excel(name = "终点里程", width = 15, orderNum = "7")
     @ExcelExport(value = "终点里程", sort = 8)
     private BigDecimal endMileage;
 
     @ApiModelProperty("备注")
     @TableField("remark")
-    //@Excel(name = "备注", width = 15, orderNum = "12")
     @ExcelExport(value = "备注", sort = 13)
     private String remark;
 
     @ApiModelProperty("检查人姓名")
     @TableField("check_by")
-    //@Excel(name = "检查人姓名", width = 15, orderNum = "8")
     @ExcelExport(value = "检查人姓名", sort = 9)
     private String checkBy;
 
     @ApiModelProperty("检查日期")
     @TableField("check_time")
-   // @Excel(name = "检查日期", width = 15, format = "yyyy-MM-dd", orderNum = "9")
     @ExcelExport(value = "检查日期", format = "yyyy-MM-dd",sort = 10)
     private Date checkTime;
 
     @ApiModelProperty("审核人姓名")
     @TableField("verify_by")
-   // @Excel(name = "审核人姓名", width = 15, orderNum = "10")
     @ExcelExport(value = "审核人姓名",sort = 11)
     private String verifyBy;
 
@@ -141,7 +138,6 @@ public class RecordsMasterCheck implements Serializable {
     @TableField("verify_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-   // @Excel(name = "审核日期", width = 15, format = "yyyy-MM-dd", orderNum = "11")
     @ExcelExport(value = "审核日期",format = "yyyy-MM-dd",sort = 12)
     private Date verifyTime;
 

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

@@ -26,6 +26,7 @@
             <if test="dto.endTime != null">
                 AND t1.check_time <![CDATA[  <=  ]]> #{dto.endTime}
             </if>
+                AND t1.type = #{dto.type}
                 AND t2.status = 1
             order by t1.create_time desc
         </where>

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

@@ -34,24 +34,30 @@ public class RecordsMasterCheckVO {
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @ApiModelProperty("更新人")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @ApiModelProperty("设备检查类型（1：道岔使用情况；2：钢轨伤损情况；3：曲线磨损情况；4：钢轨波磨情况；5：道床使用情况）")
+    private String type;
+
     @ApiModelProperty("检查批次编号")
     private String ekCode;
 
     @ApiModelProperty("工单编号")
     private String workCode;
 
+    @ApiModelProperty("轨距水平尺编号")
+    private String gaugeCode;
+
     @ApiModelProperty("检查区间id")
     private String subwaySectionId;
 

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查数据设备-设备检查记录数据-道岔使用情况检查数据
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-01
+ */
+@Data
+public class RecordsMasterTurnoutInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty("设备检查记录主表id")
+    private String recordsMasterId;
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
+    private String type;
+
+    @ApiModelProperty("值1")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    private String numSix;
+
+
+    @ApiModelProperty("值7")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}