From 10a6b034ac3807c625d2711043ddc9bf1a369d7e Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 1 Aug 2025 16:59:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BF=A1=E5=8F=B7=E7=8F=AD=E7=BB=84?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=20=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=87=BA=E5=9C=BA-=E6=9D=83=E9=99=90=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/bmw/person/service/InOutServiceImpl.java | 4 ++-- .../com/bonus/bmw/team/entity/NoSignalTeamSetUpBean.java | 1 + .../main/resources/mapper/team/NoSignalTeamSetUpMapper.xml | 5 ++++- .../js/work/team/noSignalTeam/noSignalTeamSetUpList.js | 7 ++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java index fb1420c..1ffaa7e 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java @@ -41,12 +41,12 @@ public class InOutServiceImpl implements InOutService { SelfPermissionSettingUtils.getSelfPermission(request); - String orgId = (String) request.getParams().get("orgId"); + /*String orgId = (String) request.getParams().get("orgId"); if(!StringUtils.isEmpty(orgId)){ String childList = getChildListDao.getChildList(orgId); Map params = request.getParams(); params.put("orgAll",childList); - } + }*/ String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel(); String subId = SecurityUtils.getLoginUser().getSysUser().getSubId(); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/entity/NoSignalTeamSetUpBean.java b/modules/bmw/src/main/java/com/bonus/bmw/team/entity/NoSignalTeamSetUpBean.java index 223288c..395df23 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/entity/NoSignalTeamSetUpBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/entity/NoSignalTeamSetUpBean.java @@ -27,4 +27,5 @@ public class NoSignalTeamSetUpBean private String state; private String keyWord; private String teamStatus; + private String attendNum; //无信号打卡人数 } diff --git a/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml b/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml index 19b7acf..856d18a 100644 --- a/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml +++ b/modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml @@ -54,9 +54,11 @@ bnst.remark AS remark, if(CURDATE() BETWEEN bnst.start_time AND bnst.stop_time = 1,'生效中','已失效') AS state, su.username AS uploadName, - bst.is_active AS teamStatus + bst.is_active AS teamStatus, + COUNT(DISTINCT bnstp.id) AS attendNum FROM bm_no_signal_team bnst + LEFT JOIN bm_no_signal_team_person bnstp ON bnstp.signal_team_id = bnst.id AND bnstp.IS_ACTIVE = '1' LEFT JOIN bm_sub_team bst ON bst.id = bnst.team_id LEFT JOIN bm_subcontractor bs ON bs.id = bnst.sub_id AND bs.is_active = '1' LEFT JOIN bm_project bp ON bp.id = bnst.pro_id AND bp.is_active = '1' @@ -72,6 +74,7 @@ bst.team_name like concat('%', #{params.keyWord}, '%') ) + GROUP BY bnst.id limit #{offset}, #{limit} diff --git a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js index 931e9f2..1aaafa9 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js +++ b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js @@ -143,12 +143,17 @@ function init(){ "render": function (data, type, row) { var state = row['state']; var teamStatus = row['teamStatus']; + var attendNum = row['attendNum']; var id = row['id']; var html = ''; html += buttonCheck(id, "sys:noSignalTeamSetUp:query", pers); if(teamStatus == '1'){ - html += buttonUpdate(id, "sys:noSignalTeamSetUp:update", pers); + if(attendNum>0){ + // html += "已有考勤人员，不可修改" + }else{ + html += buttonUpdate(id, "sys:noSignalTeamSetUp:update", pers); + } } return html; }