From 5637070c77ad24c595b73d628d52e83a28b51ba8 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 6 Feb 2026 18:28:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8C=89=E5=9B=BA=E5=AE=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E3=80=81=E4=B8=B4=E6=97=B6=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/basic/entity/ProjectGeneralBean.java | 1 - .../resources/mapper/basic/ProjectMapper.xml | 13 +++---------- .../resources/mapper/basic/UserMapper.xml | 14 ++++---------- .../mapper/subeva/SubCorepersonMapper.xml | 11 ++++++----- .../static/downloads/业主信息导入模板.xlsx | Bin 10768 -> 10500 bytes .../js/work/ProjectManage/projectManage.js | 4 ++-- .../work/SettingManage/UserManage/UserList.js | 14 +++++++------- .../SettingManage/UserManage/UserList.html | 12 ++++++------ 8 files changed, 28 insertions(+), 41 deletions(-) diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java index 856473a..f408393 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectGeneralBean.java @@ -17,7 +17,6 @@ public class ProjectGeneralBean { /** * 总工程电压 */ - @Excel(name = "电压等级") private String level; /** * 工程id diff --git a/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml b/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml index f6674dd..5ccf24f 100644 --- a/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml @@ -268,16 +268,9 @@ \ No newline at end of file diff --git a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml index cd15470..1bfd7bd 100644 --- a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml @@ -13,10 +13,7 @@ AND sru.is_active = '1' LEFT JOIN sys_role sr ON sr.id = sru.roleId LEFT JOIN bm_subcontractor bs ON bs.id = t.sub_id - LEFT JOIN bm_team_user_relation btur ON btur.id_number = t.id_number and btur.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.v = btur.team_id and bsr.is_active = '1' and bsr.type = '3' - LEFT JOIN bm_sub_contract bsc ON bsc.id = bsr.sub_contract_id and bsc.is_active = '1' - LEFT JOIN bm_project bp ON bp.id = bsc.pro_id and bp.is_active = '1' + LEFT JOIN bm_project bp ON bp.id = t.pro_id and bp.is_active = '1' LEFT JOIN pm_organization po2 ON bp.company_id = po2.ID LEFT JOIN ( SELECT id_number, project_id, is_furlough_person FROM bm_worker_ein_history WHERE ( is_furlough_person = '1' OR exit_status != 1 ) AND is_active = '1' limit 1) bweh ON bweh.id_number = t.id_number LEFT JOIN bm_project bp2 ON bp2.id = bweh.project_id @@ -55,7 +52,7 @@ t.phone AS phonenumber, IF( FIND_IN_SET( '3', sr.type ), - po2.`name`, + po.`NAME`, po.`NAME` ) AS orgName, sr.`NAME` AS roleName, @@ -76,10 +73,7 @@ AND sru.is_active = '1' LEFT JOIN sys_role sr ON sr.id = sru.roleId LEFT JOIN bm_subcontractor bs ON bs.id = t.sub_id - LEFT JOIN bm_team_user_relation btur ON btur.id_number = t.id_number and btur.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.v = btur.team_id and bsr.is_active = '1' and bsr.type = '3' - LEFT JOIN bm_sub_contract bsc ON bsc.id = bsr.sub_contract_id and bsc.is_active = '1' - LEFT JOIN bm_project bp ON bp.id = bsc.pro_id and bp.is_active = '1' + LEFT JOIN bm_project bp ON bp.id = t.pro_id and bp.is_active = '1' LEFT JOIN pm_organization po2 ON bp.company_id = po2.ID LEFT JOIN ( SELECT id_number, project_id, is_furlough_person FROM bm_worker_ein_history WHERE ( is_furlough_person = '1' OR exit_status != 1 ) AND is_active = '1' limit 1) bweh ON bweh.id_number = t.id_number LEFT JOIN bm_project bp2 ON bp2.id = bweh.project_id @@ -108,7 +102,7 @@ ) - ORDER BY sr.id, t.id desc + ORDER BY t.id desc limit #{offset}, #{limit} diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml index 3ac4a90..265281d 100644 --- a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml +++ b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml @@ -7,7 +7,7 @@ bp.`NAME` as proName, bs.sub_name as subName, bsc.contract_name as contractName, - COUNT(bsr.id) AS teamNumber, + COUNT(bst.id) AS teamNumber, td.`value` AS evaMonth, fcpe.eva_grade AS evaGrade, fcpe.eva_name AS evaName, @@ -24,7 +24,7 @@ `bm_sub_contract` bsc LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1' LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '3' and bsr.is_active = '1' + LEFT JOIN bm_sub_team bst ON bst.sub_id = bst.bs.id AND bst.is_active = '1' LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1' LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year} @@ -53,7 +53,7 @@ `bm_sub_contract` bsc LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1' LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '1' and bsr.is_active = '3' + LEFT JOIN bm_sub_team bst ON bst.sub_id = bst.bs.id AND bst.is_active = '1' LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1' LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year} @@ -66,7 +66,7 @@ bp.`NAME` as proName, bs.sub_name as subName, bsc.contract_name as contractName, - COUNT(bsr.id) AS teamNumber, + COUNT(bst.id) AS teamNumber, td.`value` AS evaMonth, fcpe.eva_grade AS evaGrade, fcpe.eva_name AS evaName, @@ -77,7 +77,8 @@ `bm_sub_contract` bsc LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1' LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '3' and bsr.is_active = '1' + LEFT JOIN bm_sub_team bst ON bst.sub_id = bs.id and bst.is_active ='1' + LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1' LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year} diff --git a/modules/bmw/src/main/resources/static/downloads/业主信息导入模板.xlsx b/modules/bmw/src/main/resources/static/downloads/业主信息导入模板.xlsx index 1e1d81048e17b08e9b59655b54dc4caf8fe2ea78..41b80ebae6fed7be30f12a7f960055d8b0ed16a3 100644 GIT binary patch literal 10500 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 BEwumu literal 10768 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 diff --git a/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js b/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js index 8bc4351..dbc99e9 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js +++ b/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectManage.js @@ -141,9 +141,9 @@ function init() { var proStatus = row['proStatus']; var status = row['status']; var html = ''; - // if(proStatus != "1"){ + if(proStatus != "1"){ html += toBeFinished(id, "sys:project:finish", pers); - // } + } html += buttonView(id, "", pers); html += buttonEdits(id, "sys:project:add", pers); diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js index 143ef1b..57e3d56 100644 --- a/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js +++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserList.js @@ -108,7 +108,7 @@ function init() { {"data": "roleName", "defaultContent": "","width":"9%"}, {"data": "proName", "defaultContent": "","width":"9%"}, {"data": "createTime", "defaultContent": "","width":"9%"}, - {"data": "isPush", "defaultContent": "","width":"6%", + /*{"data": "isPush", "defaultContent": "","width":"6%", "render": function (data, type, row) { var isPush = row['isPush']; let html = "" @@ -123,7 +123,7 @@ function init() { } return html; } - }, + },*/ { "width":"10%", "data": "", @@ -134,9 +134,9 @@ function init() { var phone = row['phone']; var isPush = row['isPush']; var push = "" - if(isPush !== 1){ + /*if(isPush !== 1){ push = buttonPushData( id,"sys:user:push", pers); - } + }*/ var edit = buttonEditData( id, phone, "sys:user:add", pers); var del = buttonDelData(id,"sys:user:del", pers); var Reset = buttonResetData(id, "sys:user:reset", pers); @@ -199,7 +199,7 @@ function buttonEditData(id,phone, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -274,7 +274,7 @@ function buttonResetData(id, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -312,7 +312,7 @@ function resetView(id) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } diff --git a/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html b/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html index f558622..d183731 100644 --- a/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html +++ b/modules/bmw/src/main/resources/static/pages/work/SettingManage/UserManage/UserList.html @@ -23,27 +23,27 @@
-
+
-
+
-
+
-
+
@@ -78,7 +78,7 @@ 角色 所属分包/工程
(分包/班组用户必选) 创建时间 - 推送状态 + 操作