七个数据隔离 水源，救援设备，起降点，气象站，放火站，防火队，森林管理 经纬度 用户不验证Email Unique

非必填 APP 七个基础数据 修改用户登录状态判断 用户邮箱保存 Excel 上传 测距离跨域 测量面积 其他事件详情
按照时间查询 已归档的事件 五个导入 起降点，气象站，放火站，防火队，森林管理 上传.xle文件 历史火情

mybusiness/src/main/java/com/business/slfh/manager/forestdevicemanager/controller/TResForestdeviceController.java

@@ -64,6 +64,8 @@ public class TResForestdeviceController extends BaseController
     @ResponseBody
     public TableDataInfo list(TResForestdevice tResForestdevice)
     {
+        System.out.println(tResForestdevice.getParams());
+        System.out.println(tResForestdevice.getParams().get("beginPurchaseTime"));
         startPage();
         List<TResForestdevice> list = tResForestdeviceService.selectTResForestdeviceList(tResForestdevice);
         return getDataTable(list);

mybusiness/src/main/resources/mapper/grid/manager/TResForestdeviceMapper.xml

@@ -51,8 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="manager != null  and manager != ''"> and manager = #{manager}</if>
             <if test="purchase != null  and purchase != ''"> and purchase = #{purchase}</if>
             <if test="purchaseTime != null "> and purchase_time = #{purchaseTime}</if>
+            <if test="params.beginPurchaseTime != null and params.beginPurchaseTime != ''"> and (purchase_time > #{params.beginPurchaseTime} or purchase_time = #{params.beginPurchaseTime})</if>
+            <if test="params.endPurchaseTime != null and params.endPurchaseTime != ''"> and (purchase_time &lt; #{params.endPurchaseTime} or purchase_time = #{params.endPurchaseTime})</if>
             <if test="maintenance != null "> and maintenance = #{maintenance}</if>
             <if test="nextMaintenance != null "> and next_maintenance = #{nextMaintenance}</if>
+            <if test="params.beginNextMaintenance != null and params.beginNextMaintenance != ''"> and (next_maintenance > #{params.beginNextMaintenance} or next_maintenance = #{params.beginNextMaintenance})</if>
+            <if test="params.endNextMaintenance != null and params.endNextMaintenance != ''"> and (next_maintenance &lt; #{params.endNextMaintenance} or next_maintenance = #{params.endNextMaintenance})</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>

mybusiness/src/main/resources/templates/business/manager/forestdevicemanager/index.html

@@ -52,20 +52,20 @@
                             </li>
                             <li class="select-time">
                                 <label>采购时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginPurchaseTime]"/>
+                                <input type="text" class="time-input" id="beginPurchaseTime" placeholder="开始时间" name="params[beginPurchaseTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endPurchaseTime]"/>
+                                <input type="text" class="time-input" id="endPurchaseTime" placeholder="结束时间" name="params[endPurchaseTime]"/>
                             </li>
                             <li>
                                 <label>保养周期：</label>
                                 <input type="text" name="maintenance"/>
                             </li>
-                            <!--<li class="select-time">
+                            <li class="select-time">
                                 <label>下次保养时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginNextMaintenance]"/>
+                                <input type="text" class="time-input" id="beginNextMaintenance" placeholder="开始时间" name="params[beginNextMaintenance]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endNextMaintenance]"/>
-                            </li>-->
+                                <input type="text" class="time-input" id="endNextMaintenance" placeholder="结束时间" name="params[endNextMaintenance]"/>
+                            </li>
                             <!--<li>
                                 <label>备注：</label>
                                 <input type="text"  name="remarks">