Merge branch 'master' of http://47.92.104.23:3000/LiuYing/tengda

metadata/com/kingdee/eas/custom/beisen/synchronouspos/SyncStaffOrgPosFacade.facade

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<facade xmlns="com.kingdee.bos.metadata">
+    <package>com.kingdee.eas.custom.beisen.synchronouspos</package>
+    <name>SyncStaffOrgPosFacade</name>
+    <alias>facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].alias</alias>
+    <description>facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].description</description>
+    <userDefined>true</userDefined>
+    <bosType>C16E2DAC</bosType>
+    <stereoType>false</stereoType>
+    <businessImplName>com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade</businessImplName>
+    <businessControllerName>com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacadeController</businessControllerName>
+    <accessLevel>public</accessLevel>
+    <subClassingMode>normal</subClassingMode>
+    <methods>
+        <method>
+            <name>syncStaffManage</name>
+            <isListenerMethod>false</isListenerMethod>
+            <alias>facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].alias</alias>
+            <description>facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].description</description>
+            <innerID>5b8b83fd-5728-4982-83ed-f251a98e9d3d</innerID>
+            <accessLevel>public</accessLevel>
+            <subClassingMode>normal</subClassingMode>
+            <returnValueType>String</returnValueType>
+            <metadataRef />
+            <transactionAttribute>Supports</transactionAttribute>
+            <userDefined>true</userDefined>
+            <userDefinedLogic />
+            <parameters>
+                <parameter>
+                    <name>paramData</name>
+                    <alias>facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].parameters.parameter[paramData].alias</alias>
+                    <description>facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].parameters.parameter[paramData].description</description>
+                    <direction>in</direction>
+                    <dataType>String</dataType>
+                    <metadataRef />
+                    <userDefined>true</userDefined>
+                </parameter>
+            </parameters>
+            <configured>false</configured>
+        </method>
+    </methods>
+    <resource>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="岗位编制同步" />
+            <lang locale="zh_HK" value="崗位編制同步" />
+            <lang locale="zh_TW" value="崗位編制同步" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].extendedProperty.genBusinessImplCode">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].extendedProperty.userDefined">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="同步组织岗位编制" />
+            <lang locale="zh_HK" value="同步組織崗位編制" />
+            <lang locale="zh_TW" value="同步組織崗位編制" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="同步组织岗位编制" />
+            <lang locale="zh_HK" value="同步組織崗位編制" />
+            <lang locale="zh_TW" value="同步組織崗位編制" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].parameters.parameter[paramData].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="参数" />
+            <lang locale="zh_HK" value="參數" />
+            <lang locale="zh_TW" value="參數" />
+        </rs>
+        <rs key="facade[com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacade].methods.method[syncStaffManage].parameters.parameter[paramData].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+    </resource>
+</facade>

properties/posConfig.properties

@@ -32,7 +32,7 @@ customProperties.position1=extgangwei1_433107_1257343019
 customProperties.ptime1=extshijian_433107_1542482809
 customProperties.position2=extgangwei2_433107_1926360484
 customProperties.ptime2=extshijian2_433107_2055690495
-customProperties.workAdd=extgongzuodidian_433107_1073710237
+customProperties.workAdd=extzhiji_433107_1257472470
 customProperties.frequency=extchuchapinlu_433107_902126115
 customProperties.jobRespon=extgongzuozhize_433107_1005575449
 customProperties.qualifications=extrenzhizige_433107_1814678007

src/com/kingdee/eas/custom/beisen/synchronouspos/AbstractSyncStaffOrgPosFacadeControllerBean.java

@@ -0,0 +1,60 @@
+package com.kingdee.eas.custom.beisen.synchronouspos;
+
+import javax.ejb.*;
+import java.rmi.RemoteException;
+import com.kingdee.bos.*;
+import com.kingdee.bos.util.BOSObjectType;
+import com.kingdee.bos.metadata.IMetaDataPK;
+import com.kingdee.bos.metadata.rule.RuleExecutor;
+import com.kingdee.bos.metadata.MetaDataPK;
+//import com.kingdee.bos.metadata.entity.EntityViewInfo;
+import com.kingdee.bos.framework.ejb.AbstractEntityControllerBean;
+import com.kingdee.bos.framework.ejb.AbstractBizControllerBean;
+//import com.kingdee.bos.dao.IObjectPK;
+import com.kingdee.bos.dao.IObjectValue;
+import com.kingdee.bos.dao.IObjectCollection;
+import com.kingdee.bos.service.ServiceContext;
+import com.kingdee.bos.service.IServiceContext;
+import com.kingdee.eas.framework.Result;
+import com.kingdee.eas.framework.LineResult;
+import com.kingdee.eas.framework.exception.EASMultiException;
+import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
+
+import java.lang.String;
+
+
+
+public abstract class AbstractSyncStaffOrgPosFacadeControllerBean extends AbstractBizControllerBean implements SyncStaffOrgPosFacadeController
+{
+    protected AbstractSyncStaffOrgPosFacadeControllerBean()
+    {
+    }
+
+    protected BOSObjectType getBOSType()
+    {
+        return new BOSObjectType("C16E2DAC");
+    }
+
+    public String syncStaffManage(Context ctx, String paramData) throws BOSException
+    {
+        try {
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("5b8b83fd-5728-4982-83ed-f251a98e9d3d"), new Object[]{ctx, paramData});
+            invokeServiceBefore(svcCtx);
+            if(!svcCtx.invokeBreak()) {
+            String retValue = (String)_syncStaffManage(ctx, paramData);
+            svcCtx.setMethodReturnValue(retValue);
+            }
+            invokeServiceAfter(svcCtx);
+            return (String)svcCtx.getMethodReturnValue();
+        } catch (BOSException ex) {
+            throw ex;
+        } finally {
+            super.cleanUpServiceState();
+        }
+    }
+    protected String _syncStaffManage(Context ctx, String paramData) throws BOSException
+    {    	
+        return null;
+    }
+
+}

src/com/kingdee/eas/custom/beisen/synchronouspos/ISyncStaffOrgPosFacade.java

@@ -0,0 +1,18 @@
+package com.kingdee.eas.custom.beisen.synchronouspos;
+
+import com.kingdee.bos.BOSException;
+//import com.kingdee.bos.metadata.*;
+import com.kingdee.bos.framework.*;
+import com.kingdee.bos.util.*;
+import com.kingdee.bos.Context;
+
+import com.kingdee.bos.BOSException;
+import com.kingdee.bos.util.*;
+import java.lang.String;
+import com.kingdee.bos.Context;
+import com.kingdee.bos.framework.*;
+
+public interface ISyncStaffOrgPosFacade extends IBizCtrl
+{
+    public String syncStaffManage(String paramData) throws BOSException;
+}

src/com/kingdee/eas/custom/beisen/synchronouspos/SyncStaffOrgPosFacade.java

@@ -0,0 +1,50 @@
+package com.kingdee.eas.custom.beisen.synchronouspos;
+
+import com.kingdee.bos.framework.ejb.EJBRemoteException;
+import com.kingdee.bos.util.BOSObjectType;
+import java.rmi.RemoteException;
+import com.kingdee.bos.framework.AbstractBizCtrl;
+import com.kingdee.bos.orm.template.ORMObject;
+
+import com.kingdee.bos.BOSException;
+import com.kingdee.bos.util.*;
+import java.lang.String;
+import com.kingdee.bos.Context;
+import com.kingdee.eas.custom.beisen.synchronouspos.*;
+import com.kingdee.bos.framework.*;
+
+public class SyncStaffOrgPosFacade extends AbstractBizCtrl implements ISyncStaffOrgPosFacade
+{
+    public SyncStaffOrgPosFacade()
+    {
+        super();
+        registerInterface(ISyncStaffOrgPosFacade.class, this);
+    }
+    public SyncStaffOrgPosFacade(Context ctx)
+    {
+        super(ctx);
+        registerInterface(ISyncStaffOrgPosFacade.class, this);
+    }
+    public BOSObjectType getType()
+    {
+        return new BOSObjectType("C16E2DAC");
+    }
+    private SyncStaffOrgPosFacadeController getController() throws BOSException
+    {
+        return (SyncStaffOrgPosFacadeController)getBizController();
+    }
+    /**
+     *ͬ²½×éÖ¯¸Úλ±àÖÆ-User defined method
+     *@param paramData ²ÎÊý
+     *@return
+     */
+    public String syncStaffManage(String paramData) throws BOSException
+    {
+        try {
+            return getController().syncStaffManage(getContext(), paramData);
+        }
+        catch(RemoteException err) {
+            throw new EJBRemoteException(err);
+        }
+    }
+}

src/com/kingdee/eas/custom/beisen/synchronouspos/SyncStaffOrgPosFacadeController.java

@@ -0,0 +1,21 @@
+package com.kingdee.eas.custom.beisen.synchronouspos;
+
+import com.kingdee.bos.BOSException;
+//import com.kingdee.bos.metadata.*;
+import com.kingdee.bos.framework.*;
+import com.kingdee.bos.util.*;
+import com.kingdee.bos.Context;
+
+import com.kingdee.bos.BOSException;
+import com.kingdee.bos.util.*;
+import java.lang.String;
+import com.kingdee.bos.Context;
+import com.kingdee.bos.framework.*;
+
+import java.rmi.RemoteException;
+import com.kingdee.bos.framework.ejb.BizController;
+
+public interface SyncStaffOrgPosFacadeController extends BizController
+{
+    public String syncStaffManage(Context ctx, String paramData) throws BOSException, RemoteException;
+}

src/com/kingdee/eas/custom/beisen/synchronouspos/SyncStaffOrgPosFacadeControllerBean.java

@@ -0,0 +1,42 @@
+package com.kingdee.eas.custom.beisen.synchronouspos;
+
+import com.google.common.collect.Maps;
+import com.kingdee.shr.base.syssetting.MSFServiceFacadeFactory;
+import org.apache.log4j.Logger;
+import javax.ejb.*;
+import java.rmi.RemoteException;
+import com.kingdee.bos.*;
+import com.kingdee.bos.util.BOSObjectType;
+import com.kingdee.bos.metadata.IMetaDataPK;
+import com.kingdee.bos.metadata.rule.RuleExecutor;
+import com.kingdee.bos.metadata.MetaDataPK;
+//import com.kingdee.bos.metadata.entity.EntityViewInfo;
+import com.kingdee.bos.framework.ejb.AbstractEntityControllerBean;
+import com.kingdee.bos.framework.ejb.AbstractBizControllerBean;
+//import com.kingdee.bos.dao.IObjectPK;
+import com.kingdee.bos.dao.IObjectValue;
+import com.kingdee.bos.dao.IObjectCollection;
+import com.kingdee.bos.service.ServiceContext;
+import com.kingdee.bos.service.IServiceContext;
+
+import java.lang.String;
+import java.util.Map;
+
+public class SyncStaffOrgPosFacadeControllerBean extends AbstractSyncStaffOrgPosFacadeControllerBean
+{
+    private static Logger logger =
+        Logger.getLogger("com.kingdee.eas.custom.beisen.synchronouspos.SyncStaffOrgPosFacadeControllerBean");
+
+    @Override
+    protected String _syncStaffManage(Context ctx, String paramData) throws BOSException {
+        super._syncStaffManage(ctx, paramData);
+        Object obj=null;
+        try{
+            Map<String, Object> map = Maps.newHashMap();
+            obj = MSFServiceFacadeFactory.getLocalInstance(ctx).processService("syncStaffManageOSF", map);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return obj.toString();
+    }
+}

src/com/kingdee/eas/custom/beisen/synchronouspos/SyncStaffOrgPosFacadeFactory.java

@@ -0,0 +1,30 @@
+package com.kingdee.eas.custom.beisen.synchronouspos;
+
+import com.kingdee.bos.BOSException;
+import com.kingdee.bos.BOSObjectFactory;
+import com.kingdee.bos.util.BOSObjectType;
+import com.kingdee.bos.Context;
+
+public class SyncStaffOrgPosFacadeFactory
+{
+    private SyncStaffOrgPosFacadeFactory()
+    {
+    }
+    public static ISyncStaffOrgPosFacade getRemoteInstance() throws BOSException
+    {
+        return (ISyncStaffOrgPosFacade)BOSObjectFactory.createRemoteBOSObject(new BOSObjectType("C16E2DAC") , ISyncStaffOrgPosFacade.class);
+    }
+    
+    public static ISyncStaffOrgPosFacade getRemoteInstanceWithObjectContext(Context objectCtx) throws BOSException
+    {
+        return (ISyncStaffOrgPosFacade)BOSObjectFactory.createRemoteBOSObjectWithObjectContext(new BOSObjectType("C16E2DAC") , ISyncStaffOrgPosFacade.class, objectCtx);
+    }
+    public static ISyncStaffOrgPosFacade getLocalInstance(Context ctx) throws BOSException
+    {
+        return (ISyncStaffOrgPosFacade)BOSObjectFactory.createBOSObject(ctx, new BOSObjectType("C16E2DAC"));
+    }
+    public static ISyncStaffOrgPosFacade getLocalInstance(String sessionID) throws BOSException
+    {
+        return (ISyncStaffOrgPosFacade)BOSObjectFactory.createBOSObject(sessionID, new BOSObjectType("C16E2DAC"));
+    }
+}

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

@@ -54,24 +54,25 @@ 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.CFOriginalId,staff.FControlWay, ");
+                selSql.append("         org.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, ");
-                selSql.append("         staff.FState ");
+                selSql.append("         (staff.FState+1) FState ");
                 selSql.append(" from ");
-                selSql.append(" T_HR_Staff20250623152307 staff ");
+                selSql.append(" "+FTableName+" staff ");
                 selSql.append(" left join t_org_admin org on org.fid=staff.FAdminOrgID ");
                 selSql.append(" left join t_org_position pos on pos.fid = staff.FpositionID ");
                 selSql.append(" where pos.fid is null and org.CFOriginalId 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,staff.FControlWay, ");
+                selSql.append(" select 'pos' orgpos,org.fid posId,org.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, ");
                 selSql.append("         (staff.FStaffYear-staff.FOnWayAddCount+staff.FOnWaySubCount-staff.FPersonCount) FStaffYearUsable, ");
-                selSql.append("         staff.FState ");
+                selSql.append("         (staff.FState+1) FState ");
                 selSql.append(" from ");
-                selSql.append(" T_HR_Staff20250623152307 staff ");
+                selSql.append(" "+FTableName+" staff ");
                 selSql.append(" left join t_org_admin org on org.fid=staff.FAdminOrgID ");
                 selSql.append(" left join t_org_position pos on pos.fid = staff.FpositionID ");
                 selSql.append(" where pos.fid is not null and pos.CFOriginalId is not null ");