From 5328dd1c44f79cea32049b952126d1318fff4f6a Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 26 Oct 2021 15:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/Archive_DetailMapper.xml    | 16 ++++++++++++----
 .../views/workHome/callBackStatistics.jsp        |  8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index 43881f2..c8e27b2 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -116,6 +116,8 @@
         from zd_assort z
         left join archive_detail t
         on z.assort_id=t.AssortID
+        left join archive_record_name_info
+        on archive_record_name_info.record_name = t.Title AND archive_record_name_info.effective = 1
         <if test="userId != null">
             INNER JOIN <include refid="selectPowerAssort"></include> emr_user_reader
             ON z.assort_id = emr_user_reader.assort_id
@@ -142,7 +144,7 @@
                 t.UpLoadDateTime ${order}
             </when>
             <otherwise>
-                z.assort_sort,t.UpLoadDateTime
+                z.assort_sort,archive_record_name_info.record_sort,t.UpLoadDateTime
             </otherwise>
         </choose>
     </select>
@@ -179,13 +181,15 @@
         select
         PDF_PATH,archive_detail.AssortID,archive_detail.title
         from archive_detail
+        left join archive_record_name_info
+        on archive_record_name_info.record_name = archive_detail.Title AND archive_record_name_info.effective = 1
         left join zd_assort
         on zd_assort.assort_id = archive_detail.AssortID
         where 1=1 and flag=0
         <if test="title != null and title!=''">
             and id in (${title})
         </if>
-        order by zd_assort.assort_sort,archive_detail.UpLoadDateTime
+        order by zd_assort.assort_sort,archive_record_name_info.record_sort,archive_detail.UpLoadDateTime
     </select>
     <select id="selectByColm" parameterType="com.emr.entity.Archive_Detail" resultMap="BaseResultMap">
         select
@@ -393,6 +397,8 @@
         archive_detail.Title
         FROM
         archive_detail
+        left join archive_record_name_info
+        on archive_record_name_info.record_name = archive_detail.Title AND archive_record_name_info.effective = 1
         LEFT JOIN zd_assort ON archive_detail.AssortID = zd_assort.assort_id
         WHERE
         archive_detail.flag != 1
@@ -402,15 +408,17 @@
         <if test="assortIds != null and assortIds != ''">
             AND archive_detail.AssortID in (${assortIds})
         </if>
-        ORDER BY zd_assort.assort_sort
+        ORDER BY zd_assort.assort_sort,archive_record_name_info.record_sort,archive_detail.UpLoadDateTime
     </select>
     <!--按ids集合查询pdf路径-->
     <select id="selectPdfPathByIds" resultMap="BaseResultMap">
       select PDF_PATH,archive_detail.AssortID,archive_detail.title from archive_detail
        inner join zd_assort
        on archive_detail.AssortID = zd_assort.assort_id
+       left join archive_record_name_info
+        on archive_record_name_info.record_name = archive_detail.Title AND archive_record_name_info.effective = 1
        where MasterID = #{masterId} and archive_detail.AssortID in (${detailIds}) and  flag != 1
-      order by zd_assort.assort_sort,archive_detail.UpLoadDateTime
+      order by zd_assort.assort_sort,archive_record_name_info.record_sort,archive_detail.UpLoadDateTime
   </select>
     <!--按查询按masterId分组查询assortId分类且需要完整性校验的集合-->
     <select id="selectAssortIdsByMasterIds" resultMap="BaseResultMap" parameterType="java.lang.String">
diff --git a/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp b/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp
index 770179c..29a6910 100644
--- a/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp
+++ b/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp
@@ -123,11 +123,11 @@
                 },
                 //展开详情事件
                 onExpandRow: function (index, row, $detail) {//點擊datagrid 展開按鈕事件
-                    var html = '<div id="tableDiv1">\n' +
-                        '        <table id="table1" class="table text-nowrap"></table>\n' +
+                    var time = row.time;
+                    var html = '<div id="tableDiv'+time+'">\n' +
+                        '        <table id="table'+time+'" class="table text-nowrap"></table>\n' +
                         '    </div>';
                     $detail.html(html);
-                    var time = row.time;
                     initTable1(time);
                 }
             });
@@ -157,7 +157,7 @@
         }]*/
     //第二层，按日期分组查
     function initTable1(time) {
-        $("#table1").bootstrapTable({ // 对应table标签的id
+        $("#table"+time).bootstrapTable({ // 对应table标签的id
             //data:data1,
             url: path + "/workHome/callBackStatisticsDetail", // 获取表格数据的url
             cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true