diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml index 0a8892c..4b08cf1 100644 --- a/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml +++ b/modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml @@ -20,7 +20,8 @@ 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 + IF(bste.create_time IS NULL,NULL,bste.create_time) AS conEvaTime, + bst.team_name FROM bm_sub_contract bsc LEFT JOIN bm_project bp ON bsc.pro_id = bp.id @@ -29,6 +30,7 @@ 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 cb2cfa5..6fcbd27 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,8 +92,9 @@ function init() { return c; } }, - {"data": "contractName", "defaultContent": "","width":"15%"}, - {"data": "subName", "defaultContent": "","width":"10%"}, + {"data": "contractName", "defaultContent": "","width":"12%"}, + {"data": "subName", "defaultContent": "","width":"8%"}, + {"data": "teamName", "defaultContent": "","width":"8%"}, {"data": "proName", "defaultContent": "","width":"10%"}, {"data": "corePersonName","defaultContent":"","width":"6%"}, {"data": "teamNumber", "defaultContent": "","width":"4%"}, @@ -124,7 +125,7 @@ function init() { } }, { - "width":"8%", + "width":"6%", "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 90f61c9..d6ece6d 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,13 +59,14 @@