设备管理

airport-equipment/src/main/java/com/sundot/airport/equipment/domain/EquipmentLedger.java

@@ -163,6 +163,18 @@ public class EquipmentLedger extends BaseEntity {
     @TableField(exist = false)
     private String colorType;
 
+    /** 查询最近定/自检到期日期开始日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 查询最近定/自检到期日期结束日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -419,6 +431,22 @@ public class EquipmentLedger extends BaseEntity {
         this.colorType = colorType;
     }
 
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

airport-equipment/src/main/resources/mapper/equipment/EquipmentLedgerMapper.xml

@@ -133,6 +133,10 @@
                 inspection_team_member2_name like concat('%', #{inspectionTeamUserName}, '%')
                 )
             </if>
+            <if test="startDate != null and endDate != null">
+                and (next_inspection_due_date >= #{startDate}
+                and next_inspection_due_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+            </if>
             <choose>
                 <!-- 使用状态=在用 + 早于今天 -->
                 <when test="'RED'.equals(colorType)">