生产

src/com/kingdee/eas/custom/beisen/synchronousorg/SynchronousEmpBillControllerBean.java

@@ -8,6 +8,7 @@ import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 import com.kingdee.bos.metadata.entity.*;
 import com.kingdee.bos.metadata.function.WfEventListenerStateManager;
 import com.kingdee.bos.metadata.query.util.CompareType;
+import com.kingdee.bos.util.BOSObjectType;
 import com.kingdee.bos.util.BOSUuid;
 import com.kingdee.eas.base.attachment.AttachmentFactory;
 import com.kingdee.eas.base.attachment.AttachmentInfo;
@@ -19,6 +20,8 @@ import com.kingdee.eas.base.permission.UserCollection;
 import com.kingdee.eas.base.permission.UserFactory;
 import com.kingdee.eas.base.permission.UserInfo;
 import com.kingdee.eas.basedata.org.*;
+import com.kingdee.eas.basedata.person.PersonCollection;
+import com.kingdee.eas.basedata.person.PersonFactory;
 import com.kingdee.eas.basedata.person.PersonInfo;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.custom.beisen.utils.Helper;
@@ -30,9 +33,7 @@ import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.framework.ICoreBase;
 import com.kingdee.eas.hr.affair.*;
-import com.kingdee.eas.hr.base.ApproveTypeEnum;
-import com.kingdee.eas.hr.base.HRBillStateEnum;
-import com.kingdee.eas.hr.base.HRBizDefineInfo;
+import com.kingdee.eas.hr.base.*;
 import com.kingdee.eas.hr.emp.PersonPhotoFactory;
 import com.kingdee.eas.hr.emp.PersonPhotoInfo;
 import com.kingdee.shr.attachment.AttachmentState;
@@ -214,6 +215,9 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                             System.out.println("=======入职单已存在=============");//0044610
                             OperateLogEntryInfo operateLogEntryInfo = new OperateLogEntryInfo();
                             operateLogEntryInfo.setErrorInfo("入职单已存在");
+                            EmpEnrollBizBillEntryCollection entrys1 = collection.get(0).getEntrys();
+                            String empName = entrys1.get(0).getEmpName();
+                            operateLogInfo.setName(empName);
                             entrys.add(operateLogEntryInfo);
                             try {
                                 localInstance.save(operateLogInfo);
@@ -253,13 +257,14 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                         System.out.println(e.getMessage());
                     }
                 } catch (Exception e) {
-                    operateLogInfo.setBusinessId(headId);
+                    //operateLogInfo.setBusinessId(headId);
                     OperateLogEntryCollection entrys = operateLogInfo.getEntrys();
                     OperateLogEntryInfo operateLogEntryInfo = new OperateLogEntryInfo();
                     String f = e.getMessage();
                     if (f!=null&&f.length()>500){
                         f = f.substring(0, 500);
                     }
+                    operateLogInfo.setName(f);
                     operateLogEntryInfo.setErrorInfo("整理保存头部数据失败！！！！" + f);
                     entrys.add(operateLogEntryInfo);
                     System.out.println(e.getMessage());
@@ -355,21 +360,36 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                 operateLogInfo.setBusinessName(view1.getName());
                 boolean isCreateData1 = boybsViewConfigEntryInfo.isIsCreateData();
                 try {
+                    BOSUuid read = BOSUuid.read(headId);
+                    ICoreBase bosObject = (ICoreBase) (BOSObjectFactory.createBOSObject(context, read.getType()));
+                    CoreBaseInfo coreBaseInfo = bosObject.getValue(new ObjectUuidPK(read));
+                    operateLogInfo.setName(coreBaseInfo.getString("name"));
+                    operateLogInfo.setNumber(coreBaseInfo.getString("number"));
                     if (type.getValue().equals("list")) {
-                        boyProcessing(view1, headId, jsonObject1.getJSONArray(beiSenData1), null, "fileInfos", beiSenData1);
-                        String boy = jsonObject1.getJSONArray(beiSenData1).toJSONString();
-                        if (boy.length()>500){
-                            boy = boy.substring(0, 500);
+                        JSONArray jsonArray = jsonObject1.getJSONArray(beiSenData1);
+                        if (jsonArray==null||jsonArray.size()==0){
+                            operateLogEntryInfo.setErrorInfo("北森数据不存在"+beiSenData1);
+                        }else {
+                            boyProcessing(view1, headId, jsonArray, null, "fileInfos", beiSenData1);
+                            String boy = jsonObject1.getJSONArray(beiSenData1).toJSONString();
+                            if (boy.length()>500){
+                                boy = boy.substring(0, 500);
+                            }
+                            operateLogEntryInfo.setErrorInfo(boy);
                         }
-
-                        operateLogEntryInfo.setErrorInfo(boy);
                     } else {
-                        boyProcessing(view1, isCreateData1, headId, jsonObject1.getJSONObject(beiSenData1), null, "fileInfos", beiSenData1);
-                        String boy =jsonObject1.getJSONObject(beiSenData1).toJSONString();
-                        if (boy.length()>500){
-                            boy = boy.substring(0, 500);
+                        JSONObject jsonObject11 = jsonObject1.getJSONObject(beiSenData1);
+                        if (jsonObject11==null||jsonObject11.size()==0){
+                            operateLogEntryInfo.setErrorInfo("北森数据不存在"+beiSenData1);
+                        }else {
+                            boyProcessing(view1, isCreateData1, headId,jsonObject11, null, "fileInfos", beiSenData1);
+                            String boy =jsonObject1.getJSONObject(beiSenData1).toJSONString();
+                            if (boy.length()>500){
+                                boy = boy.substring(0, 500);
+                            }
+                            operateLogEntryInfo.setErrorInfo(boy);
                         }
-                        operateLogEntryInfo.setErrorInfo(boy);
+
                     }
                     entrys1.add(operateLogEntryInfo);
                     try {
@@ -483,7 +503,7 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
 
         }
         // 处理文件信息
-        fileProcessor(save.toString(), null, jsonArray);
+        fileProcessor(save.toString(), jsonArray);
 
         if (fileJSON != null) {
             // 获取文件信息的第一个 JSON 对象
@@ -644,7 +664,7 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                 }
             }
             // 处理文件信息
-            fileProcessor(save.toString(), null, jsonArray1);
+            fileProcessor(save.toString(), jsonArray1);
         }
         if (fileJSON != null) {
             // 获取文件信息的第一个 JSON 对象
@@ -737,6 +757,7 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
             System.out.println("===============alias:" + alias);
             Object dataObject = jsonObject.get(split[0]);
             String s1 = attributes.get("data-valueType");
+            fileName = attributes.get("data-fileName");
             if (s1 != null && s1.equals("url")) {
                 if (dataObject instanceof JSONObject) {
                     JSONObject data = jsonObject.getJSONObject(split[0]);
@@ -753,12 +774,22 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                                     // 将数据的 UI 主键、下载链接和文件名添加到文件信息的 JSON 对象中
                                     file.put("uipk", attributes.get("data-uipk"));
                                     file.put("url", string);
-                                    file.put("name", data.getString("text"));
+                                    file.put("name", fileName);
                                     // 将文件信息的 JSON 对象添加到文件信息的 JSON 数组中
                                     files.add(file);
                                 }
                                 continue;
                             }
+                        }else if (value instanceof String){
+                            String string = data.getString(split[1]);
+                            file = new JSONObject();
+                            // 将数据的 UI 主键、下载链接和文件名添加到文件信息的 JSON 对象中
+                            file.put("uipk", attributes.get("data-uipk"));
+                            file.put("url", string);
+                            file.put("name", fileName);
+                            // 将文件信息的 JSON 对象添加到文件信息的 JSON 数组中
+                            files.add(file);
+                            continue;
                         }
                         if (value == null || value.equals("null") || value.equals("{}") || value.equals("")) {
                             continue;
@@ -773,6 +804,11 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
 
                 } else if (dataObject instanceof JSONArray) {
                     JSONArray jsonArray1 = jsonObject.getJSONArray(split[0]);
+                    if ((split[0].equals("entryRecord")||split[0].equals("employmentRecord"))&&jsonArray1.size()>0){
+                        jsonArray1 = paixu(jsonArray1, "entryDate");
+                        System.out.println("排序后entryRecord/employmentRecord"+jsonArray1);
+                        // （可选）将排序后的List转回JSONArray
+                    }
                     for (int j = 0; j < jsonArray1.size(); j++) {
                         JSONObject data = jsonArray1.getJSONObject(j);
                         if (data != null) {
@@ -789,7 +825,7 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                                         // 将数据的 UI 主键、下载链接和文件名添加到文件信息的 JSON 对象中
                                         file.put("uipk", attributes.get("data-uipk"));
                                         file.put("url", string);
-                                        file.put("name", data.getString("text"));
+                                        file.put("name", fileName);
                                         // 将文件信息的 JSON 对象添加到文件信息的 JSON 数组中
                                         files.add(file);
                                     }
@@ -977,12 +1013,48 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                         hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9TmaL7Z"));
                         setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
                     }else {
-                        System.out.println("====empEnrollBizBills= DawAAAApC9DmaL7Z= 否");
-                        hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9DmaL7Z"));
-                        setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
+
+                        PersonCollection personCollection = PersonFactory.getLocalInstance(context)
+                                .getPersonCollection("where PassportNO='" + value + "' or IDCardNO='" + value + "'");
+                        if (personCollection.size()>0){
+                            System.out.println("====empEnrollBizBills= DawAAAApC9TmaL7Z= 是");
+                            hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9TmaL7Z"));
+                            setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
+                        }else {
+                            System.out.println("====empEnrollBizBills= DawAAAApC9DmaL7Z= 否");
+                            hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9DmaL7Z"));
+                            setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
+                        }
+
                     }
                 } else {
-                    setCoreBaseInfo(coreBaseInfo, name, value);
+                    if (name.equals("nCell")){
+                        String s = extractContent((String) value);
+                        System.out.println(s +"''''''''"+value );
+                        if (s!=null&&!s.equals("")){
+                            System.out.println("setCoreBaseInfo(coreBaseInfo, \"globalRoaming\", s);\n");
+                            setCoreBaseInfo(coreBaseInfo, "globalRoaming", s);
+                            value = ((String) value).replace("("+s+")","");
+                            setCoreBaseInfo(coreBaseInfo, name, value);
+                        }else {
+                            System.out.println("setCoreBaseInfo(coreBaseInfo, \"globalRoaming\", +86);\n");
+                            setCoreBaseInfo(coreBaseInfo, "globalRoaming", "+86");
+                        }
+                    }else if (name.equals("entrys.nCell")||name.equals("entrys.telNum")){
+                        String s = extractContent((String) value);
+                        System.out.println(s +"''''''''"+value );
+                        if (s!=null&&!s.equals("")) {
+                            System.out.println("setCoreBaseInfo(coreBaseInfo, \"entrys.globalRoaming\", s));\n");
+                            setCoreBaseInfo(coreBaseInfo, "entrys.globalRoaming", s);
+                            value = ((String) value).replace("("+s+")","");
+                            setCoreBaseInfo(coreBaseInfo, name, value);
+                        }else {
+                            System.out.println("setCoreBaseInfo(coreBaseInfo, \"entrys.globalRoaming\", +86));\n");
+                            setCoreBaseInfo(coreBaseInfo, "entrys.globalRoaming", "+86");
+                        }
+                    }else {
+                        setCoreBaseInfo(coreBaseInfo, name, value);
+                    }
                     // 将值设置到当前实体对象中
                     //coreBaseInfo.put(name, value);
                 }
@@ -993,6 +1065,29 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
         // 返回处理后的文件信息的 JSON 数组
         return files;
     }
+    /**
+     * 提取字符串中括号内的内容
+     * @param input 包含括号的原始字符串
+     * @return 括号内的内容，若格式不合法则返回空字符串
+     */
+    public  String extractContent(String input) {
+        // 检查输入是否为空
+        if (input == null || input.isEmpty()) {
+            return "";
+        }
+
+        // 定位左括号'('和右括号')'的位置
+        int leftIndex = input.indexOf('(');
+        int rightIndex = input.indexOf(')');
+
+        // 校验括号位置合法性（左括号存在、右括号存在、左括号在右括号之前）
+        if (leftIndex == -1 || rightIndex == -1 || leftIndex >= rightIndex) {
+            return "";
+        }
+
+        // 截取括号之间的内容（左括号后一位到右括号前一位）
+        return input.substring(leftIndex + 1, rightIndex);
+    }
 
     public void setCoreBaseInfo(CoreBaseInfo coreBaseInfo, String name, Object value) {
         System.out.println("+++++++++++++++" + name + ":" + value);
@@ -1029,8 +1124,8 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                 if (split[1].equals("position")) {
                     if (value instanceof PositionInfo) {
                         objectValue.put("job", ((PositionInfo) value).getJob());
+                        objectValue.put("adminOrg", ((PositionInfo) value).getAdminOrgUnit());
                     }
-
                 }
             }
         } else {
@@ -1125,14 +1220,8 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
             save = bosObject.save(coreBaseInfo);
 
         }
-        PersonInfo personInfo = null;
-        if (coreBaseInfo instanceof PersonInfo) {
-            personInfo = (PersonInfo) coreBaseInfo;
-        } else {
-            personInfo = (PersonInfo) (coreBaseInfo.get("person"));
-        }
         // 处理文件信息
-        fileProcessor(save.toString(), personInfo, jsonArray);
+        fileProcessor(save.toString(), jsonArray);
 
         // 获取文件信息的第一个 JSON 对象
         if (fileJSON != null) {
@@ -1245,10 +1334,8 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
             save = bosObject.save(coreBaseInfo);
 
         }
-
-        PersonInfo personInfo = (PersonInfo) coreBaseInfo.get("person");
         // 处理文件信息
-        fileProcessor(save.toString(), personInfo, jsonArray);
+        fileProcessor(save.toString(), jsonArray);
 
         // 获取文件信息的第一个 JSON 对象
         if (fileJSON != null) {
@@ -1308,11 +1395,10 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
      * 处理文件信息
      *
      * @param id         关联的 ID
-     * @param personInfo 人员信息对象
      * @param jsonArray  文件信息的 JSON 数组
      * @throws JSONException JSON 处理异常
      */
-    public void fileProcessor(String id, PersonInfo personInfo, JSONArray jsonArray) throws JSONException {
+    public void fileProcessor(String id, JSONArray jsonArray) throws JSONException {
         // 遍历文件信息的 JSON 数组
         for (int i = 0; i < jsonArray.size(); i++) {
             // 获取单个文件信息
@@ -1327,15 +1413,25 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                 continue;
             }
             if (uipk.equals("PersonPhoto")) {
+                System.out.println("头像处理");
                 try {
+                    PersonInfo personInfo = getPerson(id);
                     if (personInfo != null) {
+                        System.out.println("========personInfo 获取到的员工id===="+personInfo.getId());
                         // 保存人员照片信息
                         savePersonPhoto(personInfo, url);
+                    }else {
+                        System.out.println("========personInfo 获取到的员工id==== null");
+
                     }
 
                 } catch (IOException e) {
                     // 抛出运行时异常，表示保存人员照片信息失败
-                    throw new RuntimeException(e);
+                    throw new RuntimeException(e+"抛出运行时异常，表示保存人员照片信息失败");
+                } catch (BOSException e) {
+                    throw new RuntimeException(e+"查询入制单失败！或者查询临时员工失败！"+id);
+                } catch (EASBizException e) {
+                    throw new RuntimeException(e+"查询入制单失败！或者查询临时员工失败！"+id);
                 }
             } else {
                 try {
@@ -1346,19 +1442,22 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                     } else {
                         dataImg = helper.getBytesByNetURL("http:" + url);
                     }
-
-
                     // 插入人员附件信息
-                    if (name == null) {
+                    if (name != null&&!name.equals("")) {
+                        String s = extractFileNameFromUrl(url);
+                        String[] split = s.split("\\.");
+                        System.out.println("+++++split+++++++++"+split[1]);
+                        name = name + "." +split[1];
+                    }else {
                         name = extractFileNameFromUrl(url);
                     }
                     insertPersonAttachment(name, uipk, id, dataImg);
                 } catch (IOException e) {
                     // 抛出运行时异常，表示下载文件数据失败
-                    throw new RuntimeException(e);
+                    throw new RuntimeException(e+"抛出运行时异常，表示下载文件数据失败");
                 } catch (BOSException e) {
                     // 抛出运行时异常，表示插入人员附件信息失败
-                    throw new RuntimeException(e);
+                    throw new RuntimeException(e+"抛出运行时异常，表示插入人员附件信息失败");
                 } catch (EASBizException e) {
                     // 抛出运行时异常，表示插入人员附件信息失败
                     throw new RuntimeException(e);
@@ -1367,9 +1466,57 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
         }
     }
 
+    public PersonInfo getPerson(String id) throws BOSException, EASBizException {
+        PersonInfo personInfo = null;
+        BOSUuid read = BOSUuid.read(id);
+        BOSObjectType type = read.getType();
+        String bosType = type.toString();
+        if (bosType.equals("80EF7DED")){
+            System.out.println("传入的ID："+id+" 为员工，personInfo bosType：80EF7DED");
+            personInfo = new PersonInfo();
+            personInfo.setId(read);
+        }else if (bosType.equals("B41CAA3F")){
+            System.out.println("传入的ID："+id+" 入职单, EmpEnrollBizBill bosType：B41CAA3F");
+            System.out.println("查询入职单："+id+"");
+            EmpEnrollBizBillInfo empEnrollBizBillInfo = EmpEnrollBizBillFactory
+                    .getLocalInstance(context).getEmpEnrollBizBillInfo("where id = '" + id + "'");
+            EmpEnrollBizBillEntryCollection entrys = empEnrollBizBillInfo.getEntrys();
+            if (entrys.size()<=0){
+                throw new RuntimeException("入职单没有对应的分录："+id);
+            }
+            EmpEnrollBizBillEntryInfo empEnrollBizBillEntryInfo = entrys.get(0);
+            BOSUuid entryId = empEnrollBizBillEntryInfo.getId();
+            System.out.println("查询入职单分录/查询临时人员："+entryId+"");
+            TempPersonPhotoCollection tempPersonPhotoCollection = TempPersonPhotoFactory.getLocalInstance(context).
+                    getTempPersonPhotoCollection("where EmpEnrollBillEntryId = '" + entryId + "'");
+            if (tempPersonPhotoCollection.size()<=0){
+                System.out.println("创建临时员工");
+                TempPersonPhotoInfo tempPersonPhotoInfo = new TempPersonPhotoInfo();
+                BOSUuid bosUuid = BOSUuid.create("80EF7DED");
+                System.out.println("创建临时员工id"+bosUuid.toString());
+                tempPersonPhotoInfo.setTempPersonId(bosUuid.toString());
+                tempPersonPhotoInfo.setEmpEnrollBillEntryId(empEnrollBizBillEntryInfo);
+                IObjectPK save = TempPersonPhotoFactory.getLocalInstance(context).save(tempPersonPhotoInfo);
+                System.out.println("=========save====保持临时员工信息==="+save);
+                personInfo = new PersonInfo();
+                personInfo.setId(bosUuid);
+            }else {
+                System.out.println("查询到了临时员工");
+                TempPersonPhotoInfo tempPersonPhotoInfo = tempPersonPhotoCollection.get(0);
+                String tempPersonId = tempPersonPhotoInfo.getTempPersonId();
+                personInfo = new PersonInfo();
+                personInfo.setId(BOSUuid.read(tempPersonId));
+            }
+
+        }
+        return personInfo;
+    }
+
     public static void main(String[] args) {
-        String name = extractFileNameFromUrl("https://dfiles.italent.cn/download/recruitonboardingfile/433107/1753067254/3/66304e3e5cb7431f9fb1900ba675cee3.jpg?sig_t=1753070295&sig_exp=2592000&sig_a=recruitonboarding&sig_pm=8&sig_npm=2&sig_v=1&sig=41d7e3c49cef36421ff8c4c4bd4ff6b145810ca3");
-        System.out.println(name);
+//        String name = extractFileNameFromUrl("https://dfiles.italent.cn/download/recruitonboardingfile/433107/1753067254/3/66304e3e5cb7431f9fb1900ba675cee3.jpg?sig_t=1753070295&sig_exp=2592000&sig_a=recruitonboarding&sig_pm=8&sig_npm=2&sig_v=1&sig=41d7e3c49cef36421ff8c4c4bd4ff6b145810ca3");
+
+        String s = new SynchronousEmpBillControllerBean().extractContent("18xxxx1111");
+        System.out.println(s);
     }
 
     // 从URL中提取文件名
@@ -1450,7 +1597,8 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
             // 获取用户 ID
             String userId = userInfo.getId().toString();
             // 设置附件名称
-            ai.setName(filename.substring(0, filename.lastIndexOf(46)));
+            System.out.println("+++filename+++"+filename);
+            ai.setName(filename.substring(0, filename.lastIndexOf(".")));
             // 设置附件简单名称
             ai.setSimpleName(filename.substring(filename.lastIndexOf(".") + 1));
             // 设置附件描述
@@ -1665,10 +1813,10 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
             }
         }
     }
-    JSONArray paixu (JSONArray jsonArray,String entryDate){
+    JSONArray paixu (JSONArray jsonArray,final String entryDate){
         List<JSONObject> list = jsonArray.toJavaList(JSONObject.class);
         // 定义日期格式
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
         // 排序
         Collections.sort(list, new Comparator<JSONObject>() {
             @Override
@@ -1684,7 +1832,7 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
 
                     // 比较日期
                     return date2.compareTo(date1);
-                } catch (ParseException e) {
+                } catch (Exception e) {
                     // 处理日期解析异常
                     e.printStackTrace();
                     return 0;

src/com/kingdee/eas/custom/beisen/synchronousorg/synchronousOrgControllerBean.java

@@ -175,9 +175,11 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
                 throw e;
             }
             JSONObject customFieldList = new JSONObject();
-            //部门负责人岗位编码
-            customFieldList.put("extbumenfuzerengangweibianma_433107_1704083012", responPosition.getNumber());
-            customFieldList.put("extbumenfuzerengangweimingcheng_433107_501692677", responPosition.getName());
+            //部门负责人岗位编码 注释的是测试的  后面是生产的（extbumenfuzerengangweibianma_611852_1958016168，extbumenfuzerengangweimingcheng_611852_315949968）
+            //customFieldList.put("extbumenfuzerengangweibianma_433107_1704083012", responPosition.getNumber());
+            //customFieldList.put("extbumenfuzerengangweimingcheng_433107_501692677", responPosition.getName());
+            customFieldList.put("extbumenfuzerengangweibianma_611852_1958016168", responPosition.getNumber());
+            customFieldList.put("extbumenfuzerengangweimingcheng_611852_315949968", responPosition.getName());
             requestBody.put("customFieldList", customFieldList);
         }
 
@@ -242,6 +244,7 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
             // orgId 为空时，添加查询条件，筛选更新时间在指定日期范围之内的组织信息
             filterInfo.getFilterItems().add(new FilterItemInfo("lastUpdateTime", dayBefore, CompareType.GREATER_EQUALS));
             filterInfo.getFilterItems().add(new FilterItemInfo("lastUpdateTime", date, CompareType.LESS_EQUALS));
+            filterInfo.getFilterItems().add(new FilterItemInfo("isSealUp",false,CompareType.EQUALS));
         }
         // 设置查询条件到查询视图信息对象中
         entityViewInfo.setFilter(filterInfo);

src/com/kingdee/eas/custom/interfacelog/businessoperationlog/app/OperateLogControllerBean.java

@@ -6,6 +6,9 @@ import com.kingdee.bos.metadata.entity.EntityObjectInfo;
 import com.kingdee.bos.util.BOSUuid;
 import com.kingdee.eas.basedata.org.AdminOrgUnitInfo;
 import com.kingdee.eas.framework.*;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillEntryCollection;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillEntryInfo;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillInfo;
 import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
 import com.kingdee.shr.base.syssetting.util.MetaDataUtil;
 import org.apache.log4j.Logger;
@@ -94,8 +97,24 @@ public class OperateLogControllerBean extends AbstractOperateLogControllerBean {
             if (collection.size() > 0) {
                 // 获取集合中的第一个元素
                 CoreBaseInfo coreBaseInfo = collection.get(0);
-                // 设置操作日志的名称
-                operateLogInfo.setName(coreBaseInfo.getString("name"));
+                if (coreBaseInfo instanceof EmpEnrollBizBillInfo){
+                    EmpEnrollBizBillInfo empEnrollBizBillInfo = (EmpEnrollBizBillInfo)coreBaseInfo;
+                    EmpEnrollBizBillEntryCollection entrys = empEnrollBizBillInfo.getEntrys();
+                    String name = "";
+                    for (int i = 0; i <entrys.size(); i++) {
+                        EmpEnrollBizBillEntryInfo empEnrollBizBillEntryInfo = entrys.get(i);
+                        name+=empEnrollBizBillEntryInfo.getEmpName()+",";
+                    }
+                    if (name.length()>0){
+                        name = name.substring(0,name.length()-1);
+                        // 设置操作日志的名称
+                        operateLogInfo.setName(name);
+                    }
+                }else {
+                    // 设置操作日志的名称
+                    operateLogInfo.setName(coreBaseInfo.getString("name"));
+                }
+
                 // 设置操作日志的编号
                 operateLogInfo.setNumber(coreBaseInfo.getString("number"));
             }
@@ -104,45 +123,4 @@ public class OperateLogControllerBean extends AbstractOperateLogControllerBean {
         // 调用父类的 _addnew 方法完成添加操作
         return super._addnew(ctx, operateLogInfo);
     }
-    public static void main(String[] args) {
-        // 假设这是你的JSONArray
-        String jsonStr = "[{\"organizationName\":\"人力资源管理中心\",\"organizationCode\":\"2\",\"fileInfos\":[],\"id\":\"71c35a64-7c53-4bbd-8700-ac5cf73feb81\",\"entryDate\":\"2025-08-01T00:00:00\",\"jobNumber\":null,\"isCharge\":null,\"place\":null,\"userID\":408241917,\"originalId\":2878593,\"post\":\"fac1edc9-d2d2-4c4e-bd54-029220822844\",\"jobRank\":null,\"jobGrade\":null,\"poIdEmpAdmin\":0,\"poIdEmpReserve\":0,\"job\":null,\"planEntryDate\":null,\"planDate\":\"2025-08-01T00:00:00\",\"probationDate\":6,\"extendInfos\":[{\"text\":null,\"name\":\"Onwer\",\"value\":10000}]},{\"organizationName\":\"人力资源管理中心\",\"organizationCode\":\"2\",\"fileInfos\":[],\"id\":\"33a75888-81bf-4914-877e-d1b5c071f1c1\",\"entryDate\":\"2025-08-07T00:00:00\",\"jobNumber\":null,\"isCharge\":null,\"place\":null,\"userID\":408241917,\"originalId\":2878593,\"post\":\"f1560c71-c04f-4621-9931-9126f6d0b23f\",\"jobRank\":null,\"jobGrade\":null,\"poIdEmpAdmin\":0,\"poIdEmpReserve\":0,\"job\":null,\"planEntryDate\":null,\"planDate\":\"2025-08-08T00:00:00\",\"probationDate\":5,\"extendInfos\":[{\"text\":null,\"name\":\"Onwer\",\"value\":10000}]}]";
-        JSONArray jsonArray = JSONArray.parseArray(jsonStr);
-
-        // 转换为List以便排序
-        List<JSONObject> list = jsonArray.toJavaList(JSONObject.class);
-
-        // 定义日期格式
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-
-        // 排序
-        Collections.sort(list, new Comparator<JSONObject>() {
-            @Override
-            public int compare(JSONObject o1, JSONObject o2) {
-                try {
-                    // 获取entryDate字段
-                    String dateStr1 = o1.getString("entryDate");
-                    String dateStr2 = o2.getString("entryDate");
-
-                    // 解析为Date对象
-                    Date date1 = sdf.parse(dateStr1);
-                    Date date2 = sdf.parse(dateStr2);
-
-                    // 比较日期
-                    return date2.compareTo(date1);
-                } catch (ParseException e) {
-                    // 处理日期解析异常
-                    e.printStackTrace();
-                    return 0;
-                }
-            }
-        });
-
-        // （可选）将排序后的List转回JSONArray
-        JSONArray sortedJsonArray = JSONArray.parseArray(JSONArray.toJSONString(list));
-
-        // 输出排序结果
-        System.out.println("排序后的JSONArray:");
-        System.out.println(sortedJsonArray);
-    }
 }

src/com/kingdee/eas/hr/org/app/OrgUnitOptFacadeControllerBeanEx.java

@@ -6,6 +6,7 @@ import com.kingdee.bos.Context;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.custom.beisen.synchronousorg.synchronousOrg;
 import com.kingdee.eas.custom.beisen.synchronousorg.synchronousOrgControllerBean;
+import com.kingdee.eas.custom.beisen.synchronousorg.synchronousOrgFactory;
 import com.kingdee.eas.custom.beisen.utils.BeiSenUtils;
 
 import java.io.IOException;
@@ -28,6 +29,11 @@ public class OrgUnitOptFacadeControllerBeanEx extends OrgUnitOptFacadeController
      * @return 外部接口返回的 JSONObject 对象
      */
     private JSONObject syncOrgOperation(Context context,String urlKey, String id) {
+        try {
+            synchronousOrgFactory.getLocalInstance(context).createOrUpdateOrg(10, id, false);
+        } catch (BOSException e) {
+            System.out.println("同步组织失败"+e.getMessage());
+        }
         // 创建 BeiSenUtils 工具类的实例，用于处理与外部接口交互的相关操作
         BeiSenUtils beiSenUtils = new BeiSenUtils(context);
         // 从工具类中获取配置文件的 Properties 对象
@@ -39,8 +45,8 @@ public class OrgUnitOptFacadeControllerBeanEx extends OrgUnitOptFacadeController
             url = url + "?originalId=" + URLEncoder.encode(id, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             // 如果编码过程中出现不支持的编码异常，将其包装成运行时异常抛出
+            System.out.println(e.getMessage());
             e.printStackTrace();
-            throw new RuntimeException(e);
         }
         // 初始化用于存储接口响应的 JSONObject 对象
         JSONObject jsonObject = null;
@@ -49,16 +55,16 @@ public class OrgUnitOptFacadeControllerBeanEx extends OrgUnitOptFacadeController
             jsonObject = beiSenUtils.setDisableAndEnable(id,url, "PUT");
         } catch (IOException e) {
             // 如果请求过程中出现 IO 异常或 URI 语法异常，将其包装成运行时异常抛出
+            System.out.println(e.getMessage());
             e.printStackTrace();
-            throw new RuntimeException(e);
         } catch (URISyntaxException e) {
             // 如果请求过程中出现 IO 异常或 URI 语法异常，将其包装成运行时异常抛出
+            System.out.println(e.getMessage());
             e.printStackTrace();
-            throw new RuntimeException(e);
         }
         // 检查接口响应的状态码是否为 200，如果不是则抛出运行时异常，表示同步操作失败
         if (!"200".equals(jsonObject.getString("code"))) {
-            throw new RuntimeException("同步操作失败，响应信息：" + jsonObject.toString());
+            System.out.println("同步操作失败，响应信息：" + jsonObject.toString());
         }
         return jsonObject;
     }