From def4717a09d52dd7e52d32f6900a6bf88c0183ae Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 5 Aug 2025 13:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=95=B0=E5=9B=9E=E6=98=BE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/evaluate/PersonMapper.xml         |  1 +
 .../evaluateSummaryForm.html                  | 29 ++++++---------
 .../responsibleApproval/summaryAuditView.html | 37 ++++++++-----------
 .../summaryAudit/summaryAuditView.html        | 25 +++++--------
 4 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/src/main/resources/mappers/evaluate/PersonMapper.xml b/src/main/resources/mappers/evaluate/PersonMapper.xml
index d607493..637d2e9 100644
--- a/src/main/resources/mappers/evaluate/PersonMapper.xml
+++ b/src/main/resources/mappers/evaluate/PersonMapper.xml
@@ -154,6 +154,7 @@
             su.id_card like concat('%',#{keyWord},'%')
             )
         </if>
+        order by su.username
     </select>
     <select id="getPerSonByPhone" resultType="java.lang.Integer">
         select count(1)
diff --git a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html
index 398b387..7eb9ac3 100644
--- a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html
+++ b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html
@@ -36,7 +36,7 @@
         soulTable: 'excel',	// 模块
     });
     let headerRows;
-    let layer, laydate, table,excel;
+    let layer, laydate, table, excel;
     let tableLoading;
     let code = 0;
     let tableIns = null;
@@ -44,7 +44,7 @@
     let tableCode = 1;
     $(function () {
 
-        layui.use(['layer', 'laydate', 'table','excel'], function () {
+        layui.use(['layer', 'laydate', 'table', 'excel'], function () {
             layer = layui.layer;
             laydate = layui.laydate;
             table = layui.table;
@@ -446,21 +446,16 @@
                                     }
                                 });
                                 //计算小计
-                                // if (twoLevelCountType === '最高分') {
-                                //     subTotals = Math.max(...subArr);
-                                // } else if (twoLevelCountType === '平均分') {
-                                //     subTotals = (subArr.reduce((prev, curr) => {
-                                //         return prev + curr;
-                                //     }, 0) / subArr.length).toFixed(2);
-                                // } else if (twoLevelCountType === '最低分') {
-                                //     subTotals = Math.min(...subArr);
-                                // }
-                                if (twoLevelCountType === '最高分') {
-                                    subTotals = Math.max(...subArr).toFixed(2);
-                                } else if (twoLevelCountType === '平均分') {
-                                    subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
-                                } else if (twoLevelCountType === '最低分') {
-                                    subTotals = Math.min(...subArr).toFixed(2);
+                                if (subArr.length > 0) {
+                                    if (twoLevelCountType === '最高分') {
+                                        subTotals = Math.max(...subArr).toFixed(2);
+                                    } else if (twoLevelCountType === '平均分') {
+                                        subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
+                                    } else if (twoLevelCountType === '最低分') {
+                                        subTotals = Math.min(...subArr).toFixed(2);
+                                    }
+                                } else {
+                                    subTotals = "0.00";
                                 }
                                 itemData[item + '-subtotal'] = subTotals;
                                 subTotals = 0;
diff --git a/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html b/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html
index a6b723c..725ac2a 100644
--- a/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html
+++ b/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html
@@ -56,15 +56,15 @@
                         if (data[i].isApprove == '0') {
                             btn =
                                 `<button class="layui-btn layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','0')">${data[i].name}评价审批</button>`;
-                        }else if (data[i].isApprove == '1') {
+                        } else if (data[i].isApprove == '1') {
                             btn =
                                 `<button class="layui-btn layui-btn-primary layui-border layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','1')">${data[i].name}</button>`;
-                        }else if (data[i].isApprove == '2') {
+                        } else if (data[i].isApprove == '2') {
                             btn =
                                 `<button class="layui-btn layui-btn-primary layui-border-red layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','2')">${data[i].name}</button>`;
                         }
 
-                        if (localStorage.getItem("AllAuditTitle") === '查看'){
+                        if (localStorage.getItem("AllAuditTitle") === '查看') {
                             btn =
                                 `<button class="layui-btn layui-btn-primary layui-border layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','1')">${data[i].name}</button>`;
                         }
@@ -245,21 +245,16 @@
                                     }
                                 });
                                 //计算小计
-                                // if (twoLevelCountType === '最高分') {
-                                //     subTotals = Math.max(...subArr);
-                                // } else if (twoLevelCountType === '平均分') {
-                                //     subTotals = (subArr.reduce((prev, curr) => {
-                                //         return prev + curr;
-                                //     }, 0) / subArr.length).toFixed(2);
-                                // } else if (twoLevelCountType === '最低分') {
-                                //     subTotals = Math.min(...subArr);
-                                // }
-                                if (twoLevelCountType === '最高分') {
-                                    subTotals = Math.max(...subArr).toFixed(2);
-                                } else if (twoLevelCountType === '平均分') {
-                                    subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
-                                } else if (twoLevelCountType === '最低分') {
-                                    subTotals = Math.min(...subArr).toFixed(2);
+                                if (subArr.length > 0) {
+                                    if (twoLevelCountType === '最高分') {
+                                        subTotals = Math.max(...subArr).toFixed(2);
+                                    } else if (twoLevelCountType === '平均分') {
+                                        subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
+                                    } else if (twoLevelCountType === '最低分') {
+                                        subTotals = Math.min(...subArr).toFixed(2);
+                                    }
+                                } else {
+                                    subTotals = "0.00";
                                 }
                                 itemData[item + '-subtotal'] = subTotals;
                                 subTotals = 0;
@@ -336,7 +331,7 @@
                                 });
                                 if (typeof value === 'number') {
                                     itemData[totalField] = t.toFixed(2);
-                                }else {
+                                } else {
                                     itemData[totalField] = t;
                                 }
 
@@ -345,7 +340,7 @@
                     })
                     //计算总得分
                     layui.each(res.data, function (i, itemData) {
-                       //对每一行所有total结尾的进行加和
+                        //对每一行所有total结尾的进行加和
                         let map = {};
                         for (let key in itemData) {
                             map[key] = itemData[key];
@@ -530,7 +525,7 @@
         });
     }
 
-    function openPage(id, name,type) {
+    function openPage(id, name, type) {
         let url = './otherEvaluateAuditForm.html?deptId=' + id + '&evaluateId=' + getUrlParam('evaluateId') +
             '&templateId=' + getUrlParam('templateId') + '&type=' + type;
         if (id == '0') {
diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html b/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html
index 649ad85..27205e6 100644
--- a/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html
+++ b/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html
@@ -257,21 +257,16 @@
                                     }
                                 });
                                 //计算小计
-                            /*    if (twoLevelCountType === '最高分') {
-                                    subTotals = Math.max(...subArr);
-                                } else if (twoLevelCountType === '平均分') {
-                                    subTotals = (subArr.reduce((prev, curr) => {
-                                        return prev + curr;
-                                    }, 0) / subArr.length).toFixed(2);
-                                } else if (twoLevelCountType === '最低分') {
-                                    subTotals = Math.min(...subArr);
-                                }*/
-                                if (twoLevelCountType === '最高分') {
-                                    subTotals = Math.max(...subArr).toFixed(2);
-                                } else if (twoLevelCountType === '平均分') {
-                                    subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
-                                } else if (twoLevelCountType === '最低分') {
-                                    subTotals = Math.min(...subArr).toFixed(2);
+                                if (subArr.length > 0){
+                                    if (twoLevelCountType === '最高分') {
+                                        subTotals = Math.max(...subArr).toFixed(2);
+                                    } else if (twoLevelCountType === '平均分') {
+                                        subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
+                                    } else if (twoLevelCountType === '最低分') {
+                                        subTotals = Math.min(...subArr).toFixed(2);
+                                    }
+                                }else {
+                                    subTotals = "0.00";
                                 }
                                 itemData[item + '-subtotal'] = subTotals;
                                 subTotals = 0;