diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java index 610f4fe..75eb944 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java @@ -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")) { diff --git a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml index da2c2d6..fc84648 100644 --- a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml @@ -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 diff --git a/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml b/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml index ccad2c2..ae42b02 100644 --- a/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml +++ b/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml @@ -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