`fix`

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DATABASE_USER:root}
                 password: ${DATABASE_PWD:root}
             # 从库数据源

ruoyi-system/src/main/resources/mapper/system/TableDetectionMapper.xml

@@ -41,6 +41,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilitiesId != null "> and facilities_id = #{facilitiesId}</if>
             <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
             <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
+
+            <if test="params.facilities_unit != null and params.facilities_unit != ''"><!-- 结束时间检索 -->
+                and ext1.'$.facilities_unit' =  #{params.facilities_unit}
+            </if>
+            <if test="params.searchkey != null  and params.searchkey != ''"> and  ( ext1.'$.facilities_road' like  concat('%', #{params.searchkey}, '%') or ext1.'$.facilities_name' like concat('%', #{params.searchkey}, '%') )</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(ext1.'$.task.datestart','%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(ext1.'$.task.dateend','%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+
             <if test="params.userId != null and params.userId != ''"><!-- 派发用户自己的或自己填报的或自己处理的 -->
                 <![CDATA[
                 and (

ruoyi-system/src/main/resources/mapper/system/TblMaintainMapper.xml

@@ -43,6 +43,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="facilitiesId != null "> and facilities_id = #{facilitiesId}</if>
+
+            <if test="params.facilities_unit != null and params.facilities_unit != ''"><!-- 结束时间检索 -->
+                and ext1.'$.facilities_unit' =  #{params.facilities_unit}
+            </if>
+            <if test="params.searchkey != null  and params.searchkey != ''"> and  ( ext1.'$.facilities_road' like  concat('%', #{params.searchkey}, '%') or ext1.'$.facilities_name' like concat('%', #{params.searchkey}, '%') )</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(ext1.'$.task.datestart','%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(ext1.'$.task.dateend','%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
             <if test="params.userId != null and params.userId != ''"><!-- 派发用户自己的或自己填报的或自己处理的 -->
                 <![CDATA[
                 and (