| src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/CrnTiltRecord.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/crnTiltRecord/crnTiltRecord.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java
@@ -56,8 +56,7 @@ if (!Cools.isEmpty(orderByField)) { wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); } else { // 默认按记录日期倒序 wrapper.orderBy("record_date", false); // 默认按记录时间倒序 wrapper.orderBy("record_time", false); } @@ -109,7 +108,6 @@ EntityWrapper<CrnTiltRecord> wrapper = new EntityWrapper<>(); wrapper.eq("crn_no", crnNo); wrapper.orderBy("record_date", false); wrapper.orderBy("record_time", false); wrapper.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"); @@ -137,8 +135,7 @@ convert(param, wrapper); allLike(CrnTiltRecord.class, param.keySet(), wrapper, condition); // 排序:默认按记录日期倒序 wrapper.orderBy("record_date", false); // 排序:默认按记录时间倒序 wrapper.orderBy("record_time", false); // 查询所有数据(不分页) @@ -152,7 +149,6 @@ fields.add("tiltX"); fields.add("tiltY"); fields.add("tiltZ"); fields.add("recordDate"); fields.add("recordTime"); fields.add("prevTiltValue"); fields.add("tiltChange"); src/main/java/com/zy/asrs/entity/CrnTiltRecord.java
@@ -62,14 +62,7 @@ private Float tiltZ; /** * 记录日期(每周记录一次) */ @ApiModelProperty(value = "记录日期") @TableField("record_date") private Date recordDate; /** * 记录时间 * 记录时间(包含完整的日期时间信息) */ @ApiModelProperty(value = "记录时间") @TableField("record_time") @@ -142,21 +135,6 @@ public void setTiltZ(Float tiltZ) { this.tiltZ = tiltZ; } public Date getRecordDate() { return recordDate; } public void setRecordDate(Date recordDate) { this.recordDate = recordDate; } public String getRecordDate$() { if (recordDate == null) { return ""; } return new SimpleDateFormat("yyyy-MM-dd").format(recordDate); } public Date getRecordTime() { src/main/webapp/views/crnTiltRecord/crnTiltRecord.html
@@ -21,12 +21,6 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label">记录日期:</label> <div class="layui-input-inline"> <input id="recordDate" class="layui-input" name="recordDate" type="text" placeholder="请选择日期范围" autocomplete="off"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">记录时间:</label> <div class="layui-input-inline"> <input id="recordTime" class="layui-input" name="recordTime" type="text" placeholder="请选择时间范围" autocomplete="off">