档案列表 提名太长显示不全 修改为鼠标悬停 显示全部

README.md

@@ -52,7 +52,10 @@ ______
 > 
 > #### RabbitMQ
 > * 使用docker安装
-> *
+> * 端口:`5672`
+> * web端口：`15672`
+> * 账号：`admin`
+> * 密码：`MjmaAH4lg5o84XXj`
 
 ______
 

src/main/resources/mapper/archiveMapper.xml

@@ -10,6 +10,8 @@
         FROM `tab_archives` a
         LEFT JOIN tab_dict d
         ON a.mj = d.dict_code
+        LEFT JOIN tab_secondary_archive sa
+        ON a.id = sa.archive_id
         <where>
             a.deleted = 0
             and ml IN (
@@ -31,7 +33,7 @@
                 AND a.mlh = #{mlh}
             </if>
             <if test="wjbh != null and wjbh != ''">
-                AND a.wjbh like concat(concat('%',#{wjbh}),'%')
+                AND (a.wjbh like concat(concat('%',#{wjbh}),'%') OR sa.wh like concat(concat('%',#{wjbh}),'%'))
             </if>
             <if test="ml != null and ml != ''">
                 AND a.ml = #{ml} or a.ml in (select `code` FROM tab_archives_tree where parent_id = (SELECT id FROM `tab_archives_tree` where code = #{ml}))
@@ -46,7 +48,7 @@
                 AND a.gdnd = #{gdnd}
             </if>
             <if test="ztc != null and ztc != ''">
-                AND (a.ztc like concat(concat('%',#{ztc}),'%') OR a.tm like concat(concat('%',#{ztc}),'%'))
+                AND (a.ztc like concat(concat('%',#{ztc}),'%') OR a.tm like concat(concat('%',#{ztc}),'%') OR sa.tm like concat(concat('%',#{ztc}),'%'))
             </if>
             <if test="sql != null and sql != ''">
                 ${sql}
@@ -71,10 +73,10 @@
                 AND a.mlh = #{mlh}
             </if>
             <if test="wjbh != null and wjbh != ''">
-                AND a.wjbh like concat(concat('%',#{wjbh}),'%')
+                AND (a.wjbh like concat(concat('%',#{wjbh}),'%') OR sa.wh like concat(concat('%',#{wjbh}),'%'))
             </if>
             <if test="ml != null and ml != ''">
-                AND a.ml = #{ml}
+                AND a.ml = #{ml} or a.ml in (select `code` FROM tab_archives_tree where parent_id = (SELECT id FROM `tab_archives_tree` where code = #{ml}))
             </if>
             <if test="bgqx != null and bgqx != ''">
                 AND a.bgqx = #{bgqx}
@@ -86,7 +88,7 @@
                 AND a.mj = #{mj}
             </if>
             <if test="ztc != null and ztc != ''">
-                AND (a.ztc like concat(concat('%',#{ztc}),'%') OR a.tm like concat(concat('%',#{ztc}),'%'))
+                AND (a.ztc like concat(concat('%',#{ztc}),'%') OR a.tm like concat(concat('%',#{ztc}),'%') OR sa.tm like concat(concat('%',#{ztc}),'%'))
             </if>
             <if test="sql != null and sql != ''">
                 ${sql}

src/main/resources/static/page/archive/list.html

@@ -60,7 +60,8 @@
                         <button id="resultSearch" lay-submit lay-filter="resultSearch" class="layui-btn icon-btn"><i
                                 class="layui-icon"></i>结果中搜索
                         </button>
-                        <button id="resetSearch" type="reset" lay-submit lay-filter="resetSearch" class="layui-btn icon-btn">
+                        <button id="resetSearch" type="reset" lay-submit lay-filter="resetSearch"
+                                class="layui-btn icon-btn">
                             <i class="layui-icon layui-icon-refresh-3"></i>
                             重置
                         </button>
@@ -298,7 +299,7 @@
                     {field: 'jh', title: '件号', width: 80, sort: true},
                     {
                         field: 'tm', title: '题名', width: 700, event: 'tm', templet: function (rv) {
-                            return '<a style="color: cornflowerblue;text-decoration: underline" href="#">' + rv.tm + '</a>'
+                            return '<a title="' + rv.tm + '" style="color: cornflowerblue;text-decoration: underline" href="#">' + rv.tm + '</a>'
                         }
                     },
                     {field: 'gdnd', title: '归档年度', width: 120, sort: true},

src/main/resources/static/page/borrow/list.html

@@ -282,7 +282,7 @@
                     {field: 'jh', title: '件号', width: 80, sort: true},
                     {
                         field: 'tm', title: '题名', width: 700, event: 'tm', templet: function (rv) {
-                            return '<a style="color: cornflowerblue;text-decoration: underline" href="#">' + rv.tm + '</a>'
+                            return '<a title="' + rv.tm + '" style="color: cornflowerblue;text-decoration: underline" href="#">' + rv.tm + '</a>'
                         }
                     },
                     {field: 'gdnd', title: '归档年度', width: 120, sort: true},