Przeglądaj źródła

1.MDM人员同步-再入职情况优化

Tyx 1 miesiąc temu
rodzic
commit
f0196df7f1

+ 3 - 3
code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hrmp/hbpm/task/SyncUtil.java

@@ -470,18 +470,18 @@ public class SyncUtil {
         sb.append(" left join t_hbpm_position pos on pos.fid = f.fpositionid                                               -- 岗位\n");
         sb.append(" left join t_hbpm_position pos1 on pos1.fid = pos.fparentid                                          -- 上级岗位\n");
         sb.append(" left join t_hbss_sex sex on sex.fid = b.fgenderid                                                            -- 性别\n");
-        sb.append(" left join t_hrpi_baselocation t on t.fpersonid = a.fid and t.fiscurrentversion = '1' and t.fbusinessstatus = '1' and t.fdatastatus = '1'  -- 常驻工作地\n ");
+        sb.append(" left join t_hrpi_baselocation t on t.femployeeid = person.femployeeid and t.fiscurrentversion = '1' and t.fbusinessstatus = '1' and t.fdatastatus = '1'  -- 常驻工作地\n ");
         sb.append(" left join t_hbss_workplace wp on wp.fid = t.flocationId                                           -- 工作地点\n");
         sb.append(" left join t_hbss_nationality nation on nation.fid = b.fnationalityid                              -- 国籍\n");
         sb.append(" left join t_htm_quitfileinfo i on i.femployeeid = f.femployeeid and i.fquittypeid <> '1245492024325465088'  -- 离职档案 非退休 \n");
         sb.append(" left join t_htm_quitfileinfo i1 on i1.femployeeid = f.femployeeid and i1.fquittypeid = '1245492024325465088'  -- 离职档案 退休 \n");
         sb.append(" left join t_htm_quitapplybill j on j.fid = i.fquitapplyid      -- 离职办理单 非退休 \n");
         sb.append(" left join t_htm_quitapplybill j1 on j1.fid = i1.fquitapplyid   -- 离职办理单 退休 \n");
-        sb.append(" left join t_hrpi_perserlen k on a.fid = k.fpersonid and k.fiscurrentversion = '1' and k.fdatastatus = '1' -- 服务年限\n");
+        sb.append(" left join t_hrpi_perserlen k on k.femployeeid = person.femployeeid and k.fiscurrentversion = '1' and k.fdatastatus = '1' -- 服务年限\n");
         sb.append(" left join t_hbss_flok l on l.fid = b.ffolkid                                                                          -- 民族\n");
         sb.append(" left join t_hrpi_empentrel m on m.fid = person.fempentrelid and m.fdatastatus = '1' -- 职业信息\n");
         sb.append(" left join t_hbss_laborrelstatus n on n.fid = m.flaborrelstatusid                                  -- 用工关系状态\n");
-        sb.append(" left join t_hrpi_empjobrel o on a.fid = o.fpersonid and o.fiscurrentversion = '1' and o.fbusinessstatus = '1' and o.fdatastatus = '1'   -- 职级职等 \n");
+        sb.append(" left join t_hrpi_empjobrel o on person.femployeeid = o.femployeeid and o.fiscurrentversion = '1' and o.fbusinessstatus = '1' and o.fdatastatus = '1'   -- 职级职等 \n");
         sb.append(" left join t_hbjm_joblevel p on p.fjoblevelid = o.fjoblevelid  -- 职级 \n");
         sb.append(" left join t_hbss_enterprise q on q.fid = m.fenterpriseid   -- 用人单位 \n");
         sb.append(" left join tk_nckd_personproperty r on r.fid = b.fk_nckd_personproperty -- 个人性质 \n");