diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java index 17f67c3..4680c30 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java @@ -17,6 +17,8 @@ public class ProjectBean { private String projectManager; // 参与分包商数量 private Integer subcontractorNum; + // 未出场班组数量 + private Integer noAppearingTeamGroupNum; private Integer evaluateDeptId; private Integer personInChargeId; // 所属事业部Id diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java index b4a2ac9..4966ba1 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java @@ -31,4 +31,6 @@ public interface ProjectDao { List getNoBindSubcontractorSelect(ViolationBean bean); int getProjectByName(ProjectBean projectBean); + + Integer getTeamGroup(ProjectBean bean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java index bf83f42..9eb11fc 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java @@ -22,8 +22,12 @@ public class ProjectServiceImpl implements ProjectService { public List getProjectList(ProjectBean projectBean) { List projectList = projectDao.getProjectList(projectBean); for (ProjectBean bean : projectList) { + // 参与分包商数量 Integer num = projectDao.getSubcontractorNum(bean); bean.setSubcontractorNum(num); + // 项目下是否含有未出场班组,如有不能删除 + Integer num2 = projectDao.getTeamGroup(bean); + bean.setNoAppearingTeamGroupNum(num2); } return projectList; } diff --git a/src/main/resources/mappers/evaluate/ProjectMapper.xml b/src/main/resources/mappers/evaluate/ProjectMapper.xml index 699830e..ff1d80c 100644 --- a/src/main/resources/mappers/evaluate/ProjectMapper.xml +++ b/src/main/resources/mappers/evaluate/ProjectMapper.xml @@ -44,10 +44,11 @@ poi1.name as projectName, poi2.id as departmentId, poi2.name as department, - poi1.user_name as projectManager + su.username as projectManager FROM pm_org_info poi1 LEFT JOIN pm_org_info poi2 ON poi1.parent_id = poi2.id + LEFT JOIN sys_user su on poi1.user_id = su.id WHERE poi1.LEVEL = 3 AND poi1.`status` = 1 @@ -118,4 +119,15 @@ AND poi.level = 3 AND poi.status = 1 + diff --git a/src/main/resources/static/js/evaluate/project/projectList.js b/src/main/resources/static/js/evaluate/project/projectList.js index a107d1a..9a1b877 100644 --- a/src/main/resources/static/js/evaluate/project/projectList.js +++ b/src/main/resources/static/js/evaluate/project/projectList.js @@ -109,7 +109,7 @@ function initTable() { field: "subcontractorNum", align: "center", title: "参与分包商数量", - templet: function(d) { + templet: function (d) { return '' + d.subcontractorNum + ''; } }, @@ -120,15 +120,16 @@ function initTable() { align: "center", templet: (d) => { let text = ""; - // if (d.isAudit == "1") { text += '编辑'; - // } - text += - '删除'; + + if (d.noAppearingTeamGroupNum === 0) { + text += + '删除'; + } return text; }, }, @@ -238,10 +239,10 @@ function initTable() { $(".cancel").removeClass("layui-btn-disabled").attr("disabled", false); if (res.res === 1) { - layer.msg("删除成功", { icon: 1 }); + layer.msg("删除成功", {icon: 1}); search(1); // 刷新列表 } else { - layer.msg("删除失败:" + (res.resMsg || "未知错误"), { icon: 2 }); + layer.msg("删除失败:" + (res.resMsg || "未知错误"), {icon: 2}); } layer.close(index); // 关闭弹窗 }, @@ -261,7 +262,7 @@ function initTable() { }); } catch (error) { console.error("DelReviews 错误:", error); - layer.msg("发生异常,请查看控制台", { icon: 2 }); + layer.msg("发生异常,请查看控制台", {icon: 2}); } } } @@ -278,6 +279,7 @@ function addProject() { } }); } + function openTeamMemberPage(data) { try { const layerIndex = layer.open({