bug修复

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

src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java

@@ -31,4 +31,6 @@ public interface ProjectDao {
     List<OrganizationalBean> getNoBindSubcontractorSelect(ViolationBean bean);
 
     int getProjectByName(ProjectBean projectBean);
+
+    Integer getTeamGroup(ProjectBean bean);
 }

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java

@@ -22,8 +22,12 @@ public class ProjectServiceImpl implements ProjectService {
     public List<ProjectBean> getProjectList(ProjectBean projectBean) {
         List<ProjectBean> 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;
     }

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
     </select>
+    <select id="getTeamGroup" resultType="java.lang.Integer">
+        SELECT
+            COUNT( DISTINCT poi2.id )
+        FROM
+            pm_org_info poi
+                LEFT JOIN pm_org_info poi2 ON poi.parent_id = poi2.id
+                LEFT JOIN pm_org_info poi3 ON poi2.parent_id = poi3.id
+        WHERE
+            poi.STATUS = 1
+          AND poi3.id = #{id}
+    </select>
 </mapper>

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 '<a onclick="openTeamMemberPage(' + d.id + ')" style="color: #1E9FFF; cursor: pointer;">' + d.subcontractorNum + '</a>';
                     }
                 },
@@ -120,15 +120,16 @@ function initTable() {
                     align: "center",
                     templet: (d) => {
                         let text = "";
-                        // if (d.isAudit == "1") {
                         text +=
                             '<a lay-event="edit" style="color: #009688;cursor: pointer;font-size: 15px"' +
                             '  id="edit">编辑</a>';
-                        // }
+
-                        text +=
+                        if (d.noAppearingTeamGroupNum === 0) {
-                            '<a lay-event="del" style="color: #009688;cursor: pointer;font-size:' +
+                            text +=
-                            ' 15px;margin-left: 10px"' +
+                                '<a lay-event="del" style="color: #009688;cursor: pointer;font-size:' +
-                            '  id="del">删除</a>';
+                                ' 15px;margin-left: 10px"' +
+                                '  id="del">删除</a>';
+                        }
                         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({