岗位编制修改

properties/orgStaffConfig.properties

@@ -2,11 +2,11 @@ posId=posId
 CFOriginalId=id
 staffName=staffName
 orgPosName=Name
-customProperties.FControlWay=extkongzhifangshi_433107_345852799
-customProperties.FPersonCount=extdangqianrenshu_433107_835858111,integer
-customProperties.FStaffYear=extdingbianrenshu_433107_457054722,integer
-customProperties.FYearActualStart=extqichurenshu_433107_1123968904,integer
-customProperties.FOnWayAddCount=extzaituliuru_433107_122108948,integer
-customProperties.FOnWaySubCount=extzaituliuchu_433107_614386617,integer
-customProperties.FStaffYearUsable=extkeyongbianzhi_433107_821499516,integer
-customProperties.FState=extzhuangtai_433107_1327792430
+customFieldList.FControlWay=extkongzhifangshi_433107_345852799
+customFieldList.FPersonCount=extdangqianrenshu_433107_835858111,integer
+customFieldList.FStaffYear=extdingbianrenshu_433107_457054722,integer
+customFieldList.FYearActualStart=extqichurenshu_433107_1123968904,integer
+customFieldList.FOnWayAddCount=extzaituliuru_433107_122108948,integer
+customFieldList.FOnWaySubCount=extzaituliuchu_433107_614386617,integer
+customFieldList.FStaffYearUsable=extkeyongbianzhi_433107_821499516,integer
+customFieldList.FState=extzhuangtai_433107_1327792430

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/SyncStaffManageOSFService.java

@@ -14,6 +14,8 @@ import com.kingdee.eas.custom.beisen.utils.Helper;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
 
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
@@ -55,7 +57,7 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 String FYear = rs.getString("FYear");
                 StringBuilder selSql = new StringBuilder();
                 selSql.append(" select 'org' orgpos,org.fid posId,org.fname_l2 orgPosName,org.FDisplayName_L2 staffName, ");
-                selSql.append("         org.FReserveFieldFirst CFOriginalId,(case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
+                selSql.append("         org.fid CFOriginalId,(case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
                 selSql.append("         staff.FPersonCount,staff.FStaffYear,staff.FYearActualStart, ");
                 selSql.append("         staff.FOnWayAddCount,staff.FOnWaySubCount, ");
                 selSql.append("         (staff.FStaffYear-staff.FOnWayAddCount+staff.FOnWaySubCount-staff.FPersonCount) FStaffYearUsable, ");
@@ -66,7 +68,7 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 selSql.append(" left join t_org_position pos on pos.fid = staff.FpositionID ");
                 selSql.append(" where pos.fid is null and org.FReserveFieldFirst is not null ");
                 selSql.append(" UNION all ");
-                selSql.append(" select 'pos' orgpos,org.fid posId,org.fname_l2 orgPosName,org.FDisplayName_L2 staffName,pos.CFOriginalId, ");
+                selSql.append(" select 'pos' orgpos,pos.fid posId,pos.fname_l2 orgPosName,org.FDisplayName_L2 staffName,pos.CFOriginalId, ");
                 selSql.append(" (case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
                 selSql.append("         staff.FPersonCount,staff.FStaffYear,staff.FYearActualStart, ");
                 selSql.append("         staff.FOnWayAddCount,staff.FOnWaySubCount, ");
@@ -96,7 +98,7 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                                 header.put("Content-Type", "application/json");
                                 // ÉèÖÃÇëÇóÍ·µÄ Authorization
                                 header.put("Authorization", "Bearer " + token);
-                                String url = "https://openapi.italent.cn/UserFrameworkApiV3/api/v1/departments/Put";
+                                String url = "https://openapi.italent.cn/UserFrameworkApiV3/api/v1/departments/Put?originalId="+ URLEncoder.encode((String) pos.get("id"),"UTF-8");
 
                                 JSONObject requestBody = new JSONObject(pos);
                                 System.out.println("url£º"+url);

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/SynchronousPosOSFService.java

@@ -181,45 +181,45 @@ public class SynchronousPosOSFService implements IHRMsfService {
         sql.append(" pos.fnumber posNumber, ");
         sql.append(" pos.fname_l2 posName, ");
         sql.append(" org.fid orgId, ");
-        sql.append(" org.FReserveFieldFirst orgOriginalId, ");
-        sql.append(" org.fnumber orgNumber, ");
-        sql.append(" org.fname_l2 orgName, ");
-        sql.append(" (case when pos.FDELETEDSTATUS=2 then 0 else 1 end) posDeletedStatus, ");
-        sql.append(" pos.cfzwjzygx posZwjzygx, ");
-        sql.append(" pos.cfzyzz  posZyzz, ");
-        sql.append(" pos.cfgwdwsccg posGwdwsccg, ");
-        sql.append(" pos.cfcgzb posCgzb, ");
-        sql.append(" pos.cfzlzb posZlzb, ");
-        sql.append(" jobf.fname_l2 hrJobFamily, ");
-        sql.append(" jobc.fname_l2 hrJobCategory, ");
-        sql.append(" jobsc.fname_l2 jobscHrJobSubCategory, ");
-        sql.append(" job.fnumber jobNumber, ");
-        sql.append(" job.fname_l2 jobName, ");
-        sql.append(" lowjg.fname_l2 lowJobGrade, ");
-        sql.append(" highjg.fname_l2 highJobGrade, ");
-        sql.append(" lowjl.fname_l2 lowJobLevel, ");
-        sql.append(" highjl.fname_l2 highJobLevel, ");
-        sql.append(" pos.cfeducation education, ");
-        sql.append(" pos.cfrequirement requirement, ");
-        sql.append(" pos.cfcertification certification, ");
-        sql.append(" pos.cfforeignLang foreignLang, ");
-        sql.append(" pos.cfknowledge knowledge, ");
-        sql.append(" pos.cfskills skills, ");
-        sql.append(" pos.cfexperience experience, ");
-        sql.append(" pos.cfcoreCompe coreCompe, ");
-        sql.append(" pos.cfposition1 position1, ");
-        sql.append(" pos.cfptime1 ptime1, ");
-        sql.append(" pos.cfposition2 position2, ");
-        sql.append(" pos.cfptime2 ptime2, ");
-        sql.append(" workAdd.fnumber workAdd, ");
-        sql.append(" pos.CFFrequency frequency, ");
-        sql.append(" pos.cfjobRespon jobRespon, ");
-        sql.append(" pos.cfqualifications qualifications, ");
-        sql.append(" pos.cfreserved1 reserved1, ");
-        sql.append(" pos.cfreserved2 reserved2, ");
-        sql.append(" pos.cfreserved3 reserved3, ");
-        sql.append(" pos.cfreserved4 reserved4, ");
-        sql.append(" redf.FNumber reserved5, ");
+        sql.append(" org.fid orgOriginalId, ");
+        sql.append(" isnull(org.fnumber,'') orgNumber, ");
+        sql.append(" isnull(org.fname_l2,'') orgName, ");
+        sql.append("  (case when pos.FDELETEDSTATUS=2 then 0 else 1 end) posDeletedStatus, ");
+        sql.append(" isnull(pos.cfzwjzygx,'') posZwjzygx, ");
+        sql.append(" isnull(pos.cfzyzz,'')  posZyzz, ");
+        sql.append(" isnull(pos.cfgwdwsccg,'') posGwdwsccg, ");
+        sql.append(" isnull(pos.cfcgzb,'') posCgzb, ");
+        sql.append(" isnull(pos.cfzlzb,'') posZlzb, ");
+        sql.append(" isnull(jobf.fname_l2,'') hrJobFamily, ");
+        sql.append(" isnull(jobc.fname_l2,'') hrJobCategory, ");
+        sql.append(" isnull(jobsc.fname_l2,'') jobscHrJobSubCategory, ");
+        sql.append(" isnull(job.fnumber,'') jobNumber, ");
+        sql.append(" isnull(job.fname_l2,'') jobName, ");
+        sql.append(" isnull(lowjg.fname_l2,'') lowJobGrade, ");
+        sql.append(" isnull(highjg.fname_l2,'') highJobGrade, ");
+        sql.append(" isnull(lowjl.fname_l2,'') lowJobLevel, ");
+        sql.append(" isnull(highjl.fname_l2,'') highJobLevel, ");
+        sql.append(" isnull(pos.cfeducation,'') education, ");
+        sql.append(" isnull(pos.cfrequirement,'') requirement, ");
+        sql.append(" isnull(pos.cfcertification,'') certification, ");
+        sql.append(" isnull(pos.cfforeignLang,'') foreignLang, ");
+        sql.append(" isnull(pos.cfknowledge,'') knowledge, ");
+        sql.append(" isnull(pos.cfskills,'') skills, ");
+        sql.append(" isnull(pos.cfexperience,'') experience, ");
+        sql.append(" isnull(pos.cfcoreCompe,'') coreCompe, ");
+        sql.append(" isnull(pos.cfposition1,'') position1, ");
+        sql.append(" isnull(pos.cfptime1,'') ptime1, ");
+        sql.append(" isnull(pos.cfposition2,'') position2, ");
+        sql.append(" isnull(pos.cfptime2,'') ptime2, ");
+        sql.append(" isnull(workAdd.fnumber,'') workAdd, ");
+        sql.append(" isnull(pos.CFFrequency,'') frequency, ");
+        sql.append(" isnull(pos.cfjobRespon,'') jobRespon, ");
+        sql.append(" isnull(pos.cfqualifications,'') qualifications, ");
+        sql.append(" isnull(pos.cfreserved1,'') reserved1, ");
+        sql.append(" isnull(pos.cfreserved2,'') reserved2, ");
+        sql.append(" isnull(pos.cfreserved3,'') reserved3, ");
+        sql.append(" isnull(pos.cfreserved4,'') reserved4, ");
+        sql.append(" isnull(redf.FNumber,'') reserved5, ");
         sql.append(" posp.CFOriginalId pospOriginalId1, ");
         sql.append(" posp.CFOriginalId pospOriginalId2, ");
         sql.append(" '' ");