bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复： 3693 班组评价中班组数据未回显

This commit is contained in:
gaowdong 2024-12-31 08:57:08 +08:00
parent 2865efcdec
commit 8a447b1933
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/bmw/src/main/resources/mapper/subeva/SubTeamEvaMapper.xml
View File

@ -20,7 +20,8 @@
COUNT(DISTINCT IF(bste.`level` = '2',TRUE,NULL)) AS bLevelNumber, 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` = '3',TRUE,NULL)) AS cLevelNumber,
COUNT(DISTINCT IF(bste.`level` = '4',TRUE,NULL)) AS dLevelNumber, 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 FROM
bm_sub_contract bsc bm_sub_contract bsc
LEFT JOIN bm_project bp ON bsc.pro_id = bp.id 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_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 bm_sub_team_eva bste ON bsr1.v = bste.team_id
LEFT JOIN sys_user su ON bsr.`value` = su.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 WHERE bsc.is_complete = '1' and bsr1.id is not null
GROUP BY bsc.id GROUP BY bsc.id
limit #{offset},#{limit} limit #{offset},#{limit}

7
modules/bmw/src/main/resources/static/js/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.js
View File

@ -92,8 +92,9 @@ function init() {
return c; return c;
} }
}, },
{"data": "contractName", "defaultContent": "","width":"15%"}, {"data": "contractName", "defaultContent": "","width":"12%"},
{"data": "subName", "defaultContent": "","width":"10%"}, {"data": "subName", "defaultContent": "","width":"8%"},
{"data": "teamName", "defaultContent": "","width":"8%"},
{"data": "proName", "defaultContent": "","width":"10%"}, {"data": "proName", "defaultContent": "","width":"10%"},
{"data": "corePersonName","defaultContent":"","width":"6%"}, {"data": "corePersonName","defaultContent":"","width":"6%"},
{"data": "teamNumber", "defaultContent": "","width":"4%"}, {"data": "teamNumber", "defaultContent": "","width":"4%"},
@ -124,7 +125,7 @@ function init() {
} }
}, },
{ {
"width":"8%", "width":"6%",
"render": function (data, type, row) { "render": function (data, type, row) {
let isFinish = row['finish']; let isFinish = row['finish'];
let html = ''; let html = '';

3
modules/bmw/src/main/resources/static/pages/work/SettingManage/SubTeamEvaluate/SubTeamEvaluateList.html
View File

@ -59,13 +59,14 @@
<th>序号</th> <th>序号</th>
<th>分包合同名称</th> <th>分包合同名称</th>
<th>分包商名称</th> <th>分包商名称</th>
<th>班组名称</th>
<th>工程名称</th> <th>工程名称</th>
<th>现场负责人</th> <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>
<th>操作</th> <th>操作</th>