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

人员入场

This commit is contained in:
lSun 2025-06-16 09:39:36 +08:00
parent bfc15a29d6
commit 038af166cc
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java
View File

@ -159,6 +159,8 @@ public class NoSignalTeamAttendController {
* 班组已经删除，不打卡
* 人员暂退，不打卡
* 分包合同解除班组，不打卡
*
* 电子合同， 电子签名 不校验
*/
@Scheduled(cron = "0 0 8,18 * * ?") //每天上午8点，下午6点
@SchedulerLock(name = "NoSignalTeamAttendTask", lockAtMostFor = SCHEDULER_LOCK_MAX, lockAtLeastFor = SCHEDULER_LOCK_MIN)

2
modules/bmw/src/main/resources/mapper/team/NoSignalTeamAttendMapper.xml
View File

@ -143,7 +143,7 @@
LEFT JOIN bm_no_signal_team_person bnstp ON bnstp.id_number = bw.id_number AND bnstp.IS_ACTIVE = '1'
LEFT JOIN bm_worker_photo bwp1 ON bwp1.ID_NUMBER = bw.id_number AND bwp1.IS_ACTIVE = '1'
LEFT JOIN bm_worker_contract bwc ON bwc.idCard = bw.id_number AND bwc.is_active = '1' AND CURRENT_DATE() BETWEEN contractValidDate AND contractInvalidDate
WHERE bnst.is_active = '1' AND bnst.id = #{params.id}
WHERE bnst.is_active = '1' AND bw.id_number is not null AND bnst.id = #{params.id}
<if test="params.keyWord != null and params.keyWord != '' ">
and (
bw.`name` like concat('%', #{params.keyWord}, '%')

8
modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamConfiguration.js
View File

@ -430,23 +430,23 @@ function personStauts(photoType,contractId,realityTeamId){
html += '<div style="color: #E02232">未上传人脸照片</div>'
flag = false;
}
if(photoType.indexOf('5') != -1){
/*if(photoType.indexOf('5') != -1){
html += '<div style="color: #7DBC1A">电子签名</div>'
}else {
html += '<div style="color: #E02232">未上传电子签名</div>'
flag = false;
}
}*/
}else{
html += '<div style="color: #E02232">未上传人脸照片</div>'
html += '<div style="color: #E02232">未上传电子签名</div>'
flag = false;
}
if(contractId != '' && contractId != null && contractId != 'null'){
/*if(contractId != '' && contractId != null && contractId != 'null'){
html += '<div style="color: #7DBC1A">合同</div>'
}else{
html += '<div style="color: #E02232">未上传合同或合同已失效</div>'
flag = false;
}
}*/
if(realityTeamId != '' && realityTeamId != null && realityTeamId != 'null'){
html += '<div style="color: #7DBC1A">班组</div>'
}else{