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

无信号班组设置-修改按钮添加校验 

人员出场-权限变更
This commit is contained in:
lSun 2025-08-01 16:59:52 +08:00
parent 85fe239407
commit 10a6b034ac
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java
View File

@ -41,12 +41,12 @@ public class InOutServiceImpl implements InOutService {
SelfPermissionSettingUtils.getSelfPermission(request); SelfPermissionSettingUtils.getSelfPermission(request);
String orgId = (String) request.getParams().get("orgId"); /*String orgId = (String) request.getParams().get("orgId");
if(!StringUtils.isEmpty(orgId)){ if(!StringUtils.isEmpty(orgId)){
String childList = getChildListDao.getChildList(orgId); String childList = getChildListDao.getChildList(orgId);
Map<String, Object> params = request.getParams(); Map<String, Object> params = request.getParams();
params.put("orgAll",childList); params.put("orgAll",childList);
} }*/
String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel(); String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel();
String subId = SecurityUtils.getLoginUser().getSysUser().getSubId(); String subId = SecurityUtils.getLoginUser().getSysUser().getSubId();

1
modules/bmw/src/main/java/com/bonus/bmw/team/entity/NoSignalTeamSetUpBean.java
View File

@ -27,4 +27,5 @@ public class NoSignalTeamSetUpBean
private String state; private String state;
private String keyWord; private String keyWord;
private String teamStatus; private String teamStatus;
private String attendNum; //无信号打卡人数
} }

5
modules/bmw/src/main/resources/mapper/team/NoSignalTeamSetUpMapper.xml
View File

@ -54,9 +54,11 @@
bnst.remark AS remark, bnst.remark AS remark,
if(CURDATE() BETWEEN bnst.start_time AND bnst.stop_time = 1,'生效中','已失效') AS state, if(CURDATE() BETWEEN bnst.start_time AND bnst.stop_time = 1,'生效中','已失效') AS state,
su.username AS uploadName, su.username AS uploadName,
bst.is_active AS teamStatus bst.is_active AS teamStatus,
COUNT(DISTINCT bnstp.id) AS attendNum
FROM FROM
bm_no_signal_team bnst 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_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_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' 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}, '%') bst.team_name like concat('%', #{params.keyWord}, '%')
) )
</if> </if>
GROUP BY bnst.id
limit #{offset}, #{limit} limit #{offset}, #{limit}
</select> </select>

7
modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpList.js
View File

@ -143,12 +143,17 @@ function init(){
"render": function (data, type, row) { "render": function (data, type, row) {
var state = row['state']; var state = row['state'];
var teamStatus = row['teamStatus']; var teamStatus = row['teamStatus'];
var attendNum = row['attendNum'];
var id = row['id']; var id = row['id'];
var html = ''; var html = '';
html += buttonCheck(id, "sys:noSignalTeamSetUp:query", pers); html += buttonCheck(id, "sys:noSignalTeamSetUp:query", pers);
if(teamStatus == '1'){ if(teamStatus == '1'){
html += buttonUpdate(id, "sys:noSignalTeamSetUp:update", pers); if(attendNum>0){
// html += "<span>已有考勤人员，不可修改</span>"
}else{
html += buttonUpdate(id, "sys:noSignalTeamSetUp:update", pers);
}
} }
return html; return html;
} }