liuling 8 mēneši atpakaļ
vecāks
revīzija
3fbf23b6e7

+ 8 - 6
src/com/kingdee/eas/custom/beisen/synchronousorg/AbstractSynchronousEmpBillControllerBean.java

@@ -35,24 +35,26 @@ public abstract class AbstractSynchronousEmpBillControllerBean extends AbstractB
         return new BOSObjectType("4A7B5179");
     }
 
-    public void empBill(Context ctx, String param, String viewConfigId) throws BOSException
+    public String empBill(Context ctx, String param, String viewConfigId, String userName) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("f9c6796c-967f-42cd-afe9-d57febdff355"), new Object[]{ctx, param, viewConfigId});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("f9c6796c-967f-42cd-afe9-d57febdff355"), new Object[]{ctx, param, viewConfigId, userName});
             invokeServiceBefore(svcCtx);
-              if(!svcCtx.invokeBreak()) {
-            _empBill(ctx, param, viewConfigId);
+            if(!svcCtx.invokeBreak()) {
+            String retValue = (String)_empBill(ctx, param, viewConfigId, userName);
+            svcCtx.setMethodReturnValue(retValue);
             }
             invokeServiceAfter(svcCtx);
+            return (String)svcCtx.getMethodReturnValue();
         } catch (BOSException ex) {
             throw ex;
         } finally {
             super.cleanUpServiceState();
         }
     }
-    protected void _empBill(Context ctx, String param, String viewConfigId) throws BOSException
+    protected String _empBill(Context ctx, String param, String viewConfigId, String userName) throws BOSException
     {    	
-        return;
+        return null;
     }
 
 }

+ 7 - 5
src/com/kingdee/eas/custom/beisen/synchronousorg/AbstractsynchronousOrgControllerBean.java

@@ -35,24 +35,26 @@ public abstract class AbstractsynchronousOrgControllerBean extends AbstractBizCo
         return new BOSObjectType("897A8C4E");
     }
 
-    public void createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException
+    public String createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException
     {
         try {
             ServiceContext svcCtx = createServiceContext(new MetaDataPK("f83ef127-3bc2-4c60-a96c-7800ffb94797"), new Object[]{ctx, new Integer(day), orgId, new Boolean(isDelete)});
             invokeServiceBefore(svcCtx);
-              if(!svcCtx.invokeBreak()) {
-            _createOrUpdateOrg(ctx, day, orgId, isDelete);
+            if(!svcCtx.invokeBreak()) {
+            String retValue = (String)_createOrUpdateOrg(ctx, day, orgId, isDelete);
+            svcCtx.setMethodReturnValue(retValue);
             }
             invokeServiceAfter(svcCtx);
+            return (String)svcCtx.getMethodReturnValue();
         } catch (BOSException ex) {
             throw ex;
         } finally {
             super.cleanUpServiceState();
         }
     }
-    protected void _createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException
+    protected String _createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException
     {    	
-        return;
+        return null;
     }
 
 }

+ 1 - 1
src/com/kingdee/eas/custom/beisen/synchronousorg/ISynchronousEmpBill.java

@@ -14,5 +14,5 @@ import com.kingdee.bos.util.*;
 
 public interface ISynchronousEmpBill extends IBizCtrl
 {
-    public void empBill(String param, String viewConfigId) throws BOSException;
+    public String empBill(String param, String viewConfigId, String userName) throws BOSException;
 }

+ 1 - 1
src/com/kingdee/eas/custom/beisen/synchronousorg/IsynchronousOrg.java

@@ -14,5 +14,5 @@ import com.kingdee.bos.util.*;
 
 public interface IsynchronousOrg extends IBizCtrl
 {
-    public void createOrUpdateOrg(int day, String orgId, boolean isDelete) throws BOSException;
+    public String createOrUpdateOrg(int day, String orgId, boolean isDelete) throws BOSException;
 }

+ 4 - 2
src/com/kingdee/eas/custom/beisen/synchronousorg/SynchronousEmpBill.java

@@ -37,11 +37,13 @@ public class SynchronousEmpBill extends AbstractBizCtrl implements ISynchronousE
      *入职单-User defined method
      *@param param 参数
      *@param viewConfigId 配置ID
+     *@param userName 处理业务单据人员
+     *@return
      */
-    public void empBill(String param, String viewConfigId) throws BOSException
+    public String empBill(String param, String viewConfigId, String userName) throws BOSException
     {
         try {
-            getController().empBill(getContext(), param, viewConfigId);
+            return getController().empBill(getContext(), param, viewConfigId, userName);
         }
         catch(RemoteException err) {
             throw new EJBRemoteException(err);

+ 1 - 1
src/com/kingdee/eas/custom/beisen/synchronousorg/SynchronousEmpBillController.java

@@ -17,5 +17,5 @@ import com.kingdee.bos.framework.ejb.BizController;
 
 public interface SynchronousEmpBillController extends BizController
 {
-    public void empBill(Context ctx, String param, String viewConfigId) throws BOSException, RemoteException;
+    public String empBill(Context ctx, String param, String viewConfigId, String userName) throws BOSException, RemoteException;
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 701 - 182
src/com/kingdee/eas/custom/beisen/synchronousorg/SynchronousEmpBillControllerBean.java


+ 4 - 3
src/com/kingdee/eas/custom/beisen/synchronousorg/synchronousOrg.java

@@ -34,15 +34,16 @@ public class synchronousOrg extends AbstractBizCtrl implements IsynchronousOrg
         return (synchronousOrgController)getBizController();
     }
     /**
-     *创建北森组织,通过新增字段北森组织id,北森组织id为空则在北森创建该组织-User defined method
+     *[description]创建北森组织,通过新增字段北森组织id,北森组织id为空则在北森创建该组织[%description][invokedemo][%invokedemo][returndesc]业务id[%returndesc]-User defined method
      *@param day 前沿天
      *@param orgId 组织ID
      *@param isDelete 是否删除
+     *@return
      */
-    public void createOrUpdateOrg(int day, String orgId, boolean isDelete) throws BOSException
+    public String createOrUpdateOrg(int day, String orgId, boolean isDelete) throws BOSException
     {
         try {
-            getController().createOrUpdateOrg(getContext(), day, orgId, isDelete);
+            return getController().createOrUpdateOrg(getContext(), day, orgId, isDelete);
         }
         catch(RemoteException err) {
             throw new EJBRemoteException(err);

+ 1 - 1
src/com/kingdee/eas/custom/beisen/synchronousorg/synchronousOrgController.java

@@ -17,5 +17,5 @@ import com.kingdee.bos.framework.ejb.BizController;
 
 public interface synchronousOrgController extends BizController
 {
-    public void createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException, RemoteException;
+    public String createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException, RemoteException;
 }

+ 5 - 4
src/com/kingdee/eas/custom/beisen/synchronousorg/synchronousOrgControllerBean.java

@@ -44,7 +44,7 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
      * @throws BOSException 执行过程中发生业务异常时抛出
      */
     @Override
-    protected void _createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException {
+    protected String _createOrUpdateOrg(Context ctx, int day, String orgId, boolean isDelete) throws BOSException {
         // 创建 BeiSenUtils 实例,用于与外部系统进行交互
         BeiSenUtils beiSenUtils = new BeiSenUtils(ctx);
         // 获取当前日期
@@ -53,12 +53,12 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
         Date dayBefore = getDayBefore(now, day);
         // 创建查询视图信息,用于筛选组织信息
         EntityViewInfo entityViewInfo = createEntityViewInfo(orgId, dayBefore, now);
+        String ids = "";
         try {
             // 获取组织信息本地实例
             IAdminOrgUnit localInstance = AdminOrgUnitFactory.getLocalInstance(ctx);
             // 根据查询条件获取组织信息集合
             AdminOrgUnitCollection adminOrgUnitCollection = localInstance.getAdminOrgUnitCollection(entityViewInfo);
-
             // 遍历组织信息集合
             for (int i = 0; i < adminOrgUnitCollection.size(); i++) {
                 // 获取当前组织信息
@@ -82,6 +82,7 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
                             String sql = "update T_ORG_Admin set cforiginalId = '"+data+"' where FID = '"+id+"'";
                             DBUtil.execute(ctx,sql);
                         }
+                        ids+=adminOrgUnitInfo.getId().toString();
                     } else {
                         // 响应状态码不为 200 时,记录错误信息
                         logError(adminOrgUnitInfo.getName(), orUpdateByOrg.getString("message"));
@@ -101,9 +102,9 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
             logger.error("获取组织信息集合时发生异常", e);
             throw e;
         }
-
+        return ids;
         // 调用父类的 _createOrUpdateOrg 方法
-        super._createOrUpdateOrg(ctx, day, orgId, isDelete);
+//        super._createOrUpdateOrg(ctx, day, orgId, isDelete);
     }
 
     /**

+ 44 - 0
src/com/kingdee/eas/hr/affair/app/EmpEnrollBizBillControllerBeanEx.java

@@ -0,0 +1,44 @@
+package com.kingdee.eas.hr.affair.app;
+
+import com.kingdee.bos.BOSException;
+import com.kingdee.bos.Context;
+import com.kingdee.bos.util.BOSUuid;
+import com.kingdee.eas.basedata.person.PersonInfo;
+import com.kingdee.eas.common.EASBizException;
+import com.kingdee.eas.custom.beisen.synchronousorg.SynchronousEmpBillFactory;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillEntryCollection;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillEntryInfo;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillFactory;
+import com.kingdee.eas.hr.affair.EmpEnrollBizBillInfo;
+
+public class EmpEnrollBizBillControllerBeanEx extends EmpEnrollBizBillControllerBean {
+    @Override
+    protected void _auditEntryEffect(Context ctx, BOSUuid billID) throws BOSException, EASBizException {
+        super._auditEntryEffect(ctx, billID);
+        System.out.println("============com.kingdee.eas.custom.hr.affair.app.EmpEnrollBizBillControllerBeanEx=================");
+        try {
+            String where = "select *,entrys.*,entrys.person.* where id='" + billID + "'";
+            System.out.println("==================where==="+where);
+            EmpEnrollBizBillInfo empEnrollBizBillInfo =
+                    EmpEnrollBizBillFactory.getLocalInstance(ctx).getEmpEnrollBizBillInfo(where);
+            EmpEnrollBizBillEntryCollection entrys = empEnrollBizBillInfo.getEntrys();
+            String beisenid = empEnrollBizBillInfo.getString("beisenid");
+            System.out.println("===========beisenid========"+beisenid);
+            if (beisenid != null && beisenid.length() > 0 && entrys.size() == 1) {
+                System.out.println("==========查员工==========");
+                EmpEnrollBizBillEntryInfo empEnrollBizBillEntryInfo = entrys.get(0);
+                PersonInfo person = empEnrollBizBillEntryInfo.getPerson();
+                System.out.println("==========查员工=========="+person.getName()+"====="+person.getId());
+                if (person != null) {
+                    String s = SynchronousEmpBillFactory.getLocalInstance(ctx).empBill(beisenid, "002", "0044610");
+                    System.out.println("=======s==="+s);
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("报错--》这里的操作是同步北森数据\n同步失败不要影响员工入职所以未抛出异常\n前端可" +
+                    "手动操作同步查看具体问题"+e.getMessage());
+            e.printStackTrace();
+        }
+
+    }
+}

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels