1.MDM人员同步优化-处理多护照时数据重复问题

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

@@ -410,7 +410,9 @@ public class SyncUtil {
         sb.append(" left join t_hrpi_percontact e on a.fid = e.fpersonid and e.fiscurrentversion = '1' and e.fdatastatus = '1'      -- 联系方式\n");
         sb.append(" inner join t_hrpi_empposorgrel f on f.fid = person.fempposrelid and f.fiscurrentversion = '1' and f.fisprimary = '1' and f.fdatastatus = '1'  -- 任职经历\n");
         sb.append(" left join t_hrpi_percre g on a.fid = g.fpersonid and g.fiscurrentversion = '1' and g.fcredentialstypeid = '1010' and g.fdatastatus = '1' -- 证件信息 身份证\n");
-        sb.append(" left join t_hrpi_percre g1 on a.fid = g1.fpersonid and g1.fiscurrentversion = '1' and g1.fcredentialstypeid = '1020' and g1.fdatastatus = '1' -- 证件信息 护照\n");
+        sb.append(" left join ( select fnumber,fpersonid,fmodifytime,row_number() over (partition by fpersonid order by fissuedate desc) r \n");
+        sb.append("             from t_hrpi_percre where fiscurrentversion = '1' and fcredentialstypeid = '1020' and fdatastatus = '1' ) g1 ON a.fid = g1.fpersonid AND g1.r = 1 \n");
+        //sb.append(" left join t_hrpi_percre g1 on a.fid = g1.fpersonid and g1.fiscurrentversion = '1' and g1.fcredentialstypeid = '1020' and g1.fdatastatus = '1' -- 证件信息 护照\n");
         sb.append(" left join t_hrpi_trialperiod h on a.fid = h.fpersonid and h.fiscurrentversion = '1' and h.fdatastatus = '1'      -- 试用期\n");
         sb.append(" left join t_haos_adminorg org on org.fid = f.fadminorgid                                             -- 所属部门\n");
         sb.append(" left join t_hbpm_position pos on pos.fid = f.fpositionid                                               -- 岗位\n");

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/tsrsc/plugin/form/YearCrApplyPlanFormPlugin.java

@@ -207,7 +207,7 @@ public class YearCrApplyPlanFormPlugin extends AbstractBillPlugIn implements Bef
                     "entryentity.nckd_recruitpost,entryentity.nckd_recruitnum,entryentity.nckd_majortype,entryentity.nckd_qualifications," +
                     "entryentity.nckd_payrange,entryentity.nckd_employcategory,entryentity.nckd_recruittype,nckd_year,entryentity.nckd_summary," +
                     "entryentity.nckd_casreplanid,entryentity.nckd_payrangemin,entryentity.nckd_education,entryentity.nckd_compilation," +
-                    "entryentity.nckd_currentnum,entryentity.nckd_employmentreasons", new QFilter[]{nckdYear1, qFilter, qBillstatus});
+                    "entryentity.nckd_currentnum,entryentity.nckd_employmentreasons,entryentity.nckd_empreason", new QFilter[]{nckdYear1, qFilter, qBillstatus});
             if (ObjectUtils.isEmpty(loads)) {
                 return;
             }
@@ -271,9 +271,9 @@ public class YearCrApplyPlanFormPlugin extends AbstractBillPlugIn implements Bef
                         dynamicObjentryrow.set("nckd_yearapplyentryid", object.getPkValue());
                         dynamicObjentryrow.set("nckd_education", object.get("nckd_education"));
                         dynamicObjentryrow.set("nckd_employmentreasons", object.get("nckd_employmentreasons"));
+                        dynamicObjentryrow.set("nckd_empreason", object.get("nckd_empreason"));
                         dynamicObjentryrow.set("nckd_compilation", object.get("nckd_compilation"));
                         dynamicObjentryrow.set("nckd_currentnum", object.get("nckd_currentnum"));
-
                     }
 
                 }