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

人员入场问题修改

This commit is contained in:
方亮 2026-02-09 14:39:47 +08:00
parent dda0b767fc
commit f6476354d7
3 changed files with 4 additions and 5 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/PersonComprehensiveServiceImp.java
View File

@ -305,7 +305,7 @@ public class PersonComprehensiveServiceImp implements PersonComprehensiveService
if (StringUtils.isEmpty(o.getPostId())) {
o.setPostId("0");
}
if(StringUtils.isEmpty(o.getExitTime())){
if(StringUtils.isEmpty(o.getEinTime())){
o.setEinTime(DateUtil.now());
}
//查一下上一次出场是不是同一个工程
@ -576,7 +576,7 @@ public class PersonComprehensiveServiceImp implements PersonComprehensiveService
if (StringUtils.isEmpty(o.getPostId())) {
o.setPostId("0");
}
if(StringUtils.isEmpty(o.getExitTime())){
if(StringUtils.isEmpty(o.getEinTime())){
o.setEinTime(DateUtil.now());
}
if (o.getEinStatus().equals("0") && o.getIsFurloughPerson().equals("0")) {

3
modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
View File

@ -704,7 +704,8 @@
if(bwc.contractType = '电子合同', IFNULL(bwc.sub_contract_url,
bwc.person_contract_url), null) as contractUrl,
bw.checkup_date as checkupDate,
checkup.PHOTO_PATH as checkupFilePath
checkup.PHOTO_PATH as checkupFilePath,
bweh.ein_time
FROM `bm_worker` bw
left join bm_worker_ein_history bweh on bweh.id_number = bw.id_number
and bweh.is_active = 1

2
modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml
View File

@ -343,8 +343,6 @@
AND bw.ein_status = 1
LEFT JOIN bm_team_user_relation btur ON btur.ID_NUMBER = bw.ID_NUMBER
AND btur.is_active = '1'
LEFT JOIN bm_sub_team bst ON bst.id = btur.team_id
AND bst.is_active = '1'
WHERE
bp.id IS NOT NULL
AND bst.sub_id IS NOT NULL