From 7996dda8a6d564756726689dcc70a225f2a6dd35 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Thu, 2 Jan 2025 09:16:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=203693=20?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E8=AF=84=E4=BB=B7=E4=B8=AD=E7=8F=AD=E7=BB=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/subeva/SubTeamEvaMapper.xml  | 4 +---
 .../SettingManage/SubTeamEvaluate/SubTeamEvaluateList.js   | 7 +++----
 .../SettingManage/SubTeamEvaluate/SubTeamEvaluateList.html | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml
index 4b08cf1..0a8892c 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml
@@ -20,8 +20,7 @@
             COUNT(DISTINCT IF(bste.`level` = '2',TRUE,NULL)) AS bLevelNumber,
             COUNT(DISTINCT IF(bste.`level` = '3',TRUE,NULL)) AS cLevelNumber,
             COUNT(DISTINCT IF(bste.`level` = '4',TRUE,NULL)) AS dLevelNumber,
-            IF(bste.create_time IS NULL,NULL,bste.create_time) AS conEvaTime,
-            bst.team_name
+            IF(bste.create_time IS NULL,NULL,bste.create_time) AS conEvaTime
         FROM
             bm_sub_contract bsc
             LEFT JOIN bm_project bp ON bsc.pro_id = bp.id
@@ -30,7 +29,6 @@
             LEFT JOIN bm_sub_relation bsr1 ON bsc.id = bsr1.sub_contract_id AND bsr1.type = '3'
             LEFT JOIN bm_sub_team_eva bste ON bsr1.v = bste.team_id
 	        LEFT JOIN sys_user su ON bsr.`value` = su.id
-            LEFT JOIN bm_sub_team bst on bste.team_id = bst.id
             WHERE bsc.is_complete = '1' and bsr1.id is not null
             GROUP BY bsc.id
         limit #{offset},#{limit}
diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.js
index 6fcbd27..cb2cfa5 100644
--- a/modules/bmw/src/main/resources/static/js/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.js
+++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.js
@@ -92,9 +92,8 @@ function init() {
                         return c;
                     }
                 },
-                {"data": "contractName", "defaultContent": "","width":"12%"},
-                {"data": "subName", "defaultContent": "","width":"8%"},
-                {"data": "teamName", "defaultContent": "","width":"8%"},
+                {"data": "contractName", "defaultContent": "","width":"15%"},
+                {"data": "subName", "defaultContent": "","width":"10%"},
                 {"data": "proName", "defaultContent": "","width":"10%"},
                 {"data": "corePersonName","defaultContent":"","width":"6%"},
                 {"data": "teamNumber", "defaultContent": "","width":"4%"},
@@ -125,7 +124,7 @@ function init() {
                     }
                 },
                 {
-                    "width":"6%",
+                    "width":"8%",
                     "render": function (data, type, row) {
                         let isFinish = row['finish'];
                         let html = '';
diff --git a/modules/bmw/src/main/resources/static/pages/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.html b/modules/bmw/src/main/resources/static/pages/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.html
index d6ece6d..90f61c9 100644
--- a/modules/bmw/src/main/resources/static/pages/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.html
+++ b/modules/bmw/src/main/resources/static/pages/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.html
@@ -59,14 +59,13 @@
                         <th>序号</th>
                         <th>分包合同名称</th>
                         <th>分包商名称</th>
-                        <th>班组名称</th>
                         <th>工程名称</th>
                         <th>现场负责人</th>
                         <th>备案班组数量</th>
                         <th>已评价</th>
                         <th>未评价</th>
                         <th>评价结果</th>
-                        <th>是否全部<br/>完成评价</th>
+                        <th>是否全部完成评价</th>
                         <th>合同履行完成时间</th>
                         <th>评价完成时间</th>
                         <th>操作</th>