Ver código fonte

后台任务

yuanzhi_kuang 2 dias atrás
pai
commit
af22774203

+ 4 - 4
GDYSL/src/com/kingdee/eas/custom/erp/AbstractSynPersonToErpFacadeControllerBean.java

@@ -35,13 +35,13 @@ public abstract class AbstractSynPersonToErpFacadeControllerBean extends Abstrac
         return new BOSObjectType("301BAEE8");
     }
 
-    public void synPersonToErp(Context ctx, String startDate, String endDate) throws BOSException
+    public void synPersonToErp(Context ctx, String startDate, String endDate, String pNumber) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("85f47e4e-0392-42f8-b92f-d39ccbf969d0"), new Object[]{ctx, startDate, endDate});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("85f47e4e-0392-42f8-b92f-d39ccbf969d0"), new Object[]{ctx, startDate, endDate, pNumber});
             invokeServiceBefore(svcCtx);
               if(!svcCtx.invokeBreak()) {
-            _synPersonToErp(ctx, startDate, endDate);
+            _synPersonToErp(ctx, startDate, endDate, pNumber);
             }
             invokeServiceAfter(svcCtx);
         } catch (BOSException ex) {
@@ -50,7 +50,7 @@ public abstract class AbstractSynPersonToErpFacadeControllerBean extends Abstrac
             super.cleanUpServiceState();
         }
     }
-    protected void _synPersonToErp(Context ctx, String startDate, String endDate) throws BOSException
+    protected void _synPersonToErp(Context ctx, String startDate, String endDate, String pNumber) throws BOSException
     {    	
         return;
     }

+ 3 - 3
GDYSL/src/com/kingdee/eas/custom/erp/ISynPersonToErpFacade.java

@@ -6,13 +6,13 @@ import com.kingdee.bos.framework.*;
 import com.kingdee.bos.util.*;
 import com.kingdee.bos.Context;
 
-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 com.kingdee.bos.util.*;
 
 public interface ISynPersonToErpFacade extends IBizCtrl
 {
-    public void synPersonToErp(String startDate, String endDate) throws BOSException;
+    public void synPersonToErp(String startDate, String endDate, String pNumber) throws BOSException;
 }

+ 6 - 5
GDYSL/src/com/kingdee/eas/custom/erp/SynPersonToErpFacade.java

@@ -6,12 +6,12 @@ import java.rmi.RemoteException;
 import com.kingdee.bos.framework.AbstractBizCtrl;
 import com.kingdee.bos.orm.template.ORMObject;
 
-import com.kingdee.bos.Context;
 import com.kingdee.bos.BOSException;
-import com.kingdee.eas.custom.erp.*;
+import com.kingdee.bos.util.*;
 import java.lang.String;
+import com.kingdee.bos.Context;
 import com.kingdee.bos.framework.*;
-import com.kingdee.bos.util.*;
+import com.kingdee.eas.custom.erp.*;
 
 public class SynPersonToErpFacade extends AbstractBizCtrl implements ISynPersonToErpFacade
 {
@@ -37,11 +37,12 @@ public class SynPersonToErpFacade extends AbstractBizCtrl implements ISynPersonT
      *同步人员信息到星瀚-User defined method
      *@param startDate 开始时间 (格式: yyyy-mm-dd hh:mm:ss)
      *@param endDate 结束时间 (格式: yyyy-mm-dd hh:mm:ss)
+     *@param pNumber 员工编码
      */
-    public void synPersonToErp(String startDate, String endDate) throws BOSException
+    public void synPersonToErp(String startDate, String endDate, String pNumber) throws BOSException
     {
         try {
-            getController().synPersonToErp(getContext(), startDate, endDate);
+            getController().synPersonToErp(getContext(), startDate, endDate, pNumber);
         }
         catch(RemoteException err) {
             throw new EJBRemoteException(err);

+ 3 - 3
GDYSL/src/com/kingdee/eas/custom/erp/SynPersonToErpFacadeController.java

@@ -6,16 +6,16 @@ import com.kingdee.bos.framework.*;
 import com.kingdee.bos.util.*;
 import com.kingdee.bos.Context;
 
-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 com.kingdee.bos.util.*;
 
 import java.rmi.RemoteException;
 import com.kingdee.bos.framework.ejb.BizController;
 
 public interface SynPersonToErpFacadeController extends BizController
 {
-    public void synPersonToErp(Context ctx, String startDate, String endDate) throws BOSException, RemoteException;
+    public void synPersonToErp(Context ctx, String startDate, String endDate, String pNumber) throws BOSException, RemoteException;
 }

+ 2 - 2
GDYSL/src/com/kingdee/eas/custom/erp/SynPersonToErpFacadeControllerBean.java

@@ -29,12 +29,12 @@ public class SynPersonToErpFacadeControllerBean extends AbstractSynPersonToErpFa
     
     
     @Override
-    protected void _synPersonToErp(Context ctx, String startDate, String endDate) throws BOSException
+    public void synPersonToErp(Context ctx, String startDate, String endDate, String pNumber) throws BOSException
     {    	
     	
     	try{
     		logger.info("into synPersonToErp method...");
-    		SynPersonToErpUtils.synPersonToErp(ctx, startDate, endDate);
+    		SynPersonToErpUtils.synPersonToErp(ctx, startDate, endDate,pNumber);
     	}catch(Exception e){
     		logger.error("Å×Òì³££º"+e);
     	}

+ 325 - 315
GDYSL/src/com/kingdee/eas/custom/erp/util/SynAdminOrgToERPUtils.java

@@ -15,322 +15,332 @@ import com.kingdee.bos.Context;
 import com.kingdee.bos.qing.util.StringUtils;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
+import com.kingdee.shr.sso.client.util.SSOUtil;
 
 public class SynAdminOrgToERPUtils {
 
-
-    private static Logger log = LoggerFactory.getLogger(SynSalaryFromErpUtils.class);
-
-
-    //https://sites.gtiit.edu.cn/kderpdev/ierp/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_add
-    private static String ierp = "https://sites.gtiit.edu.cn/kderpdev/ierp";
-
-
-    /**
-     * 新增:获取gt15_adminorg_add的请求地址
-     *
-     * @param request
-     * @param code
-     * @return
-     */
-    public static String getGt15AdminOrgAddUrl() {
-        Properties config = SynPublicUtils.getConfig();
-        ierp = (String) config.get("ierp");
-        return new StringBuffer().append(ierp).append("/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_add").toString();
-
-    }
-
-
-    /**
-     * 封存:获取gt15_adminorg_beta的请求地址: https://sites.gtiit.edu.cn/kderpdev/ierp/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_beta
-     *
-     * @param request
-     * @param code
-     * @return
-     */
-    public static String getGt15AdminOrgBetaUrl() {
-        Properties config = SynPublicUtils.getConfig();
-        ierp = (String) config.get("ierp");
-        return new StringBuffer().append(ierp).append("/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_beta").toString();
-
-    }
-
-
-    /**
-     * 新增:请求参数
-     * 获取所有行政组织的
-     *
-     * @param ctx
-     * @return
-     * @throws BOSException
-     * @throws SQLException
-     */
-    private static String getAdminOrgDetailEntry(Context ctx, String startDateStr, String endDateStr) throws BOSException, SQLException {
-
-
-        //获取前一天的0点时间字符串
-        String lastDateZeroTimeStr = "";
-
-        //获取当前时间的字符串
-        String noeTimeStr = "";
-
-        if (StringUtils.isEmpty(startDateStr) || StringUtils.isEmpty(endDateStr)) {
-            //获取上次同步结束的时间
-            lastDateZeroTimeStr = SynPublicUtils.getLastUpdateSynTableTimeStrByEvenName(ctx, "synAdminOrgToErp");
-
-            if (StringUtils.isEmpty(lastDateZeroTimeStr)) {
-                //为空
-                //获取前一天的0点时间字符串
-                lastDateZeroTimeStr = SynPublicUtils.getLastDateZeroTime();
-            }
-
-            //更新最新 的时间为event_timeStamp,只有在自动触发的才会修改时间
-            SynPublicUtils.updateSynTimeTable(ctx, "synAdminOrgToErp");
-
-            //获取当前时间的字符串
-            noeTimeStr = SynPublicUtils.getNowTimeStr();
-        } else {
-            lastDateZeroTimeStr = startDateStr;
-            noeTimeStr = endDateStr;
-        }
-
-        String sql = "select admin.fnumber as number,admin.fname_l1 as name_l1,admin.fname_l2 as name_l2,admin.fname_l3 as name_l3,admin.fsimplename as gt15_shortname,admin.fname_l2 as gt15_chinesename ,layerType.fnumber as orgpattern_number,layerType.fname_l1 as orgpattern_name ,admin.fdescription_l1 as fcomment,admin2.fnumber as viewparent_number from t_org_admin admin "
-                + " left join T_Org_LayerType   layerType on layerType.fid = admin.flayertypeid "
-                + " left join t_org_admin admin2 on admin2.fid = admin.fparentid where admin.fisousealup = 0 "
-                + "  and ( (admin.flastupdatetime >  {ts '" + lastDateZeroTimeStr + "'} and  admin.flastupdatetime <=  {ts '" + noeTimeStr + "'} ) "
-                + "  or (layerType.flastupdatetime >  {ts '" + lastDateZeroTimeStr + "'} and  layerType.flastupdatetime <=  {ts '" + noeTimeStr + "'} ) "
-                + "  or (admin2.flastupdatetime >  {ts '" + lastDateZeroTimeStr + "'} and  admin2.flastupdatetime <=  {ts '" + noeTimeStr + "'} )) ";
-        //+ " left join t_org_admin admin2 on admin2.fid = admin.fparentid where admin.fisousealup = 0 and  admin.fnumber  not in ('D0003','D0002','D0039','D0040') ";
-        log.info("getAdminOrgDetailEntry.sql:" + sql);
-
-        IRowSet executeQuery = DbUtil.executeQuery(ctx, sql);
-
-        JSONArray datas = new JSONArray();
-        String paramJOStr = "";
-        if (executeQuery.size() > 0) {
-            while (executeQuery.next()) {
-                String number = executeQuery.getString("number");
-                String name_l1 = executeQuery.getString("name_l1");
-                String name_l2 = executeQuery.getString("name_l2");
-                String name_l3 = executeQuery.getString("name_l3");
-                String gt15_shortname = executeQuery.getString("gt15_shortname");
-                String gt15_chinesename = executeQuery.getString("gt15_chinesename");
-                String orgpattern_number = executeQuery.getString("orgpattern_number");
-                String orgpattern_name = executeQuery.getString("orgpattern_name");
-                String fcomment = executeQuery.getString("fcomment");
-                String viewparent_number = executeQuery.getString("viewparent_number");
-
-
-                JSONArray structures = new JSONArray();
-
-                JSONObject structure = new JSONObject();
-                structure.put("view_number", "01");
-
-                if (StringUtils.isEmpty(viewparent_number)) {
-                    //根部组织不传
-                    continue;
-                }
-                structure.put("viewparent_number", viewparent_number);
-                structures.add(structure);
-
-
-                JSONObject data = new JSONObject();
-                data.put("number", number);
-
-                JSONObject name = new JSONObject();
-                name.put("en_US", name_l1);
-                name.put("zh_CN", name_l2);
-                name.put("zh_TW", name_l3);
-
-                data.put("name", name);
-                data.put("gt15_shortname", gt15_shortname);
-                data.put("gt15_chinesename", gt15_chinesename);
-
-                data.put("orgpattern_name", orgpattern_name);
-
-                if ("集团".equals(orgpattern_number)) {
-                    orgpattern_number = "Group";
-                } else if ("公司".equals(orgpattern_number)) {
-                    orgpattern_number = "Company";
-                } else if ("部门".equals(orgpattern_number)) {
-                    orgpattern_number = "Dept";
-                }
-                data.put("orgpattern_number", orgpattern_number);
-
-                data.put("fcomment", fcomment);
-
-                data.put("structure", structures);
-
-                datas.add(data);
-            }
-            JSONObject paramJO = new JSONObject();
-            paramJO.put("data", datas);
-            paramJOStr = paramJO.toString();
-        }
-        return paramJOStr;
-    }
-
-
-    /**
-     * 新增:新增行政组织接口,推送到星瀚
-     *
-     * @param ctx
-     * @param accessToken
-     * @throws Exception
-     */
-    public static String gt15_adminorg_add(Context ctx, String accessToken, String startDate, String endDate) throws Exception {
-        //获取请求地址
-        String gt15AdminOrgAddUrl = getGt15AdminOrgAddUrl();
-
-        log.info("SynAdminOrgToERPUtils.gt15_adminorg_add.gt15AdminOrgAddUrl:" + gt15AdminOrgAddUrl);
-        //构建行政组织参数
-        String paramJOStr = getAdminOrgDetailEntry(ctx, startDate, endDate);
-        log.info("SynAdminOrgToERPUtils.gt15_adminorg_add.paramJOStr:" + paramJOStr);
-        //数据保存接口
-        String responseMsg = HttpsReqUtil.postByHttps(gt15AdminOrgAddUrl, paramJOStr, accessToken);
-
-
-        return responseMsg;
-    }
-
-
-    /**
-     * 新增:推送数据到ERP功能:主体
-     *
-     * @return
-     * @throws Exception
-     */
-    public static String synAdminorgToErp(Context ctx, String startDate, String endDate) throws Exception {
-
-        //获取appToken
-        String appToken = SynSalaryFromErpUtils.getAppToken(ctx);
-        log.info("获取synAdminorgToErp.appToken:" + appToken);
-        //获取accessToken
-        String accessToken = SynSalaryFromErpUtils.getAccessToken(appToken);
-        log.info("获取synAdminorgToErp.accessToken状态为:" + accessToken);
-        //薪酬明细保存接口
-        String responseMsg = gt15_adminorg_add(ctx, accessToken, startDate, endDate);
-        log.info("synAdminorgToErp.responseMsg:" + accessToken);
-        return null;
-    }
-
-
-    /**
-     * 封存:获取封存行政组织的请求参数
-     *
-     * @param ctx
-     * @param startDateStr
-     * @param endDateStr
-     * @return
-     * @throws BOSException
-     * @throws SQLException
-     */
-    public static List<String> getAdminOrgBetaDetailEntry(Context ctx, String startDateStr, String endDateStr) throws BOSException, SQLException {
-        //String sql = " select fnumber as number from  t_org_admin where fisousealup = 1 and fnumber not in ('D0003','D0002','D0039','D0040')";
-
-        //获取前一天的0点时间字符串
-        String lastDateZeroTimeStr = "";
-
-        //获取当前时间的字符串
-        String noeTimeStr = "";
-
-        if (StringUtils.isEmpty(startDateStr) || StringUtils.isEmpty(endDateStr)) {
-            //获取上次同步结束的时间
-            lastDateZeroTimeStr = SynPublicUtils.getLastUpdateSynTableTimeStrByEvenName(ctx, "synAdminOrgBetaToErp");
-
-            if (StringUtils.isEmpty(lastDateZeroTimeStr)) {
-                //为空
-                //获取前一天的0点时间字符串
-                lastDateZeroTimeStr = SynPublicUtils.getLastDateZeroTime();
-            }
-
-            //更新最新 的时间为event_timeStamp,只有在自动触发的才会修改时间
-            SynPublicUtils.updateSynTimeTable(ctx, "synAdminOrgBetaToErp");
-
-            //获取当前时间的字符串
-            noeTimeStr = SynPublicUtils.getNowTimeStr();
-        } else {
-            lastDateZeroTimeStr = startDateStr;
-            noeTimeStr = endDateStr;
-        }
-
-
-        String sql = " select fnumber as number from  t_org_admin where fisousealup = 1 " +
-                " and (flastupdatetime > {ts '" + lastDateZeroTimeStr + "'} and  flastupdatetime <=  {ts '" + noeTimeStr + "'})";
-        log.info("getAdminOrgBetaDetailEntry.sql" + sql);
-        IRowSet executeQuery = DbUtil.executeQuery(ctx, sql);
-        List<String> numbers = new ArrayList<String>();
-        if (executeQuery.size() > 0) {
-            while (executeQuery.next()) {
-                String number = executeQuery.getString("number");
-                numbers.add(number);
-            }
-        }
-        return numbers;
-    }
-
-    /**
-     * 封存:通过编码获取
-     *
-     * @param number
-     * @return
-     */
-    public static String getParamJOStrByNumber(String number) {
-        JSONObject data = new JSONObject();
-        data.put("number", number);
-        JSONObject paramJO = new JSONObject();
-        paramJO.put("data", data);
-        String paramJOStr = paramJO.toString();
-        return paramJOStr;
-    }
-
-
-    /**
-     * 封存:根据编码封存行政组织
-     *
-     * @param ctx
-     * @param accessToken
-     * @return
-     * @throws Exception
-     */
-    public static void synGt15_adminorg_beta(Context ctx, String accessToken, String startDate, String endDate) throws Exception {
-        //获取请求地址
-        String gt15AdminOrgBetaUrl = getGt15AdminOrgBetaUrl();
-
-        log.info("SynAdminOrgToERPUtils.synGt15_adminorg_beta.gt15AdminOrgBetaUrl:" + gt15AdminOrgBetaUrl);
-        //构建行政组织参数
-        List<String> numbers = getAdminOrgBetaDetailEntry(ctx, startDate, endDate);
-        log.info("SynAdminOrgToERPUtils.gt15_adminorg_add.numbers:" + numbers.size());
-
-        for (String number : numbers) {
-            String paramJOStr = getParamJOStrByNumber(number);
-            //数据保存接口
-            String responseMsg = HttpsReqUtil.postByHttps(gt15AdminOrgBetaUrl, paramJOStr, accessToken);
-        }
-
-    }
-
-
-    /**
-     * 封存:封存根据编码封存行政组织:主体
-     *
-     * @param ctx
-     * @return
-     * @throws Exception
-     */
-    public static String syndminorgBetaToErp(Context ctx, String startDate, String endDate) throws Exception {
-        //获取appToken
-        String appToken = SynSalaryFromErpUtils.getAppToken(ctx);
-        log.info("获取syndminorgBetaToErp.appToken:" + appToken);
-        //获取accessToken
-        String accessToken = SynSalaryFromErpUtils.getAccessToken(appToken);
-        log.info("获取syndminorgBetaToErp.accessToken为:" + accessToken);
-        //薪酬明细保存接口
-        synGt15_adminorg_beta(ctx, accessToken, startDate, endDate);
-        log.info("syndminorgBetaToErp.responseMsg:" + accessToken);
-
-        return "";
-    }
-
-
+	
+	private static Logger log = LoggerFactory.getLogger(SynSalaryFromErpUtils.class);
+	
+	
+	//https://sites.gtiit.edu.cn/kderpdev/ierp/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_add
+	private static String ierp = "https://sites.gtiit.edu.cn/kderpdev/ierp";  
+	
+	
+	
+	/**
+	 * 新增:获取gt15_adminorg_add的请求地址
+	 * @param request
+	 * @param code
+	 * @return
+	 */
+	 public static String getGt15AdminOrgAddUrl() {
+		 Properties config = SynPublicUtils.getConfig();
+		  ierp = (String)config.get("ierp");
+	     return new StringBuffer().append(ierp).append("/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_add").toString();
+	       
+	 }
+	
+	
+	 /**
+		 * 封存:获取gt15_adminorg_beta的请求地址: https://sites.gtiit.edu.cn/kderpdev/ierp/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_beta
+		 * @param request
+		 * @param code
+		 * @return
+		 */
+		 public static String getGt15AdminOrgBetaUrl() {
+			 Properties config = SynPublicUtils.getConfig();
+			  ierp = (String)config.get("ierp");
+		     return new StringBuffer().append(ierp).append("/kapi/v2/gt15/base/bos_adminorg/gt15_adminorg_beta").toString();
+		       
+		 }
+	
+	
+	
+	/**
+	 * 新增:请求参数
+	 * 获取所有行政组织的
+	 * @param ctx
+	 * @return
+	 * @throws BOSException 
+	 * @throws SQLException 
+	 */
+	private static String getAdminOrgDetailEntry(Context ctx,String startDateStr, String endDateStr) throws BOSException, SQLException{
+		
+
+		//获取前一天的0点时间字符串
+		String lastDateZeroTimeStr = "";
+		
+		//获取当前时间的字符串
+		String noeTimeStr = "";
+		
+		if(StringUtils.isEmpty(startDateStr)|| StringUtils.isEmpty(endDateStr) ){	
+			 //获取上次同步结束的时间
+			 lastDateZeroTimeStr =  SynPublicUtils.getLastUpdateSynTableTimeStrByEvenName(ctx,"synAdminOrgToErp");
+			 
+			 if(StringUtils.isEmpty(lastDateZeroTimeStr)){
+				 //为空
+				//获取前一天的0点时间字符串
+				 lastDateZeroTimeStr = SynPublicUtils.getLastDateZeroTime();
+			 }
+			  
+			//更新最新 的时间为event_timeStamp,只有在自动触发的才会修改时间
+			 SynPublicUtils.updateSynTimeTable(ctx,"synAdminOrgToErp");
+			 
+			//获取当前时间的字符串
+			 noeTimeStr = SynPublicUtils.getNowTimeStr();
+		}else{
+			 lastDateZeroTimeStr = startDateStr;
+			 noeTimeStr = endDateStr;
+		}
+		
+		String sql = "select admin.fnumber as number,admin.fname_l1 as name_l1,admin.fname_l2 as name_l2,admin.fname_l3 as name_l3,admin.fsimplename as gt15_shortname,admin.fname_l2 as gt15_chinesename ,layerType.fnumber as orgpattern_number,layerType.fname_l1 as orgpattern_name ,admin.fdescription_l1 as fcomment,admin2.fnumber as viewparent_number from t_org_admin admin "
+          + " left join T_Org_LayerType   layerType on layerType.fid = admin.flayertypeid "
+          + " left join t_org_admin admin2 on admin2.fid = admin.fparentid where admin.fisousealup = 0 " 
+          +	"  and ( (admin.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  admin.flastupdatetime <=  {ts '"+noeTimeStr+"'} ) "
+          +	"  or (layerType.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  layerType.flastupdatetime <=  {ts '"+noeTimeStr+"'} ) "
+          +	"  or (admin2.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  admin2.flastupdatetime <=  {ts '"+noeTimeStr+"'} )) ";
+          //+ " left join t_org_admin admin2 on admin2.fid = admin.fparentid where admin.fisousealup = 0 and  admin.fnumber  not in ('D0003','D0002','D0039','D0040') ";
+		log.info("getAdminOrgDetailEntry.sql:"+sql);
+		
+		IRowSet executeQuery = DbUtil.executeQuery(ctx, sql);
+		
+		JSONArray datas = new JSONArray();
+		 String  paramJOStr = "";
+		if(executeQuery.size()>0){
+			while(executeQuery.next()){
+				String number = executeQuery.getString("number");
+				String name_l1 = executeQuery.getString("name_l1");
+				String name_l2 = executeQuery.getString("name_l2");
+				String name_l3 = executeQuery.getString("name_l3");
+				String gt15_shortname = executeQuery.getString("gt15_shortname");
+				String gt15_chinesename = executeQuery.getString("gt15_chinesename");
+				String orgpattern_number = executeQuery.getString("orgpattern_number");
+				String orgpattern_name = executeQuery.getString("orgpattern_name");
+				String fcomment = executeQuery.getString("fcomment");
+				String viewparent_number =  executeQuery.getString("viewparent_number");
+				
+				
+				JSONArray structures = new JSONArray();
+				
+				JSONObject structure = new JSONObject();	
+				structure.put("view_number", "01");
+				
+				if(StringUtils.isEmpty(viewparent_number)){
+					//根部组织不传
+					continue;
+				}
+				structure.put("viewparent_number", viewparent_number);
+				structures.add(structure);
+				
+				
+				JSONObject data = new JSONObject();			
+				data.put("number",number);
+				
+				JSONObject name = new JSONObject();	
+				 name.put("en_US", name_l1);
+				 name.put("zh_CN", name_l2);
+				 name.put("zh_TW", name_l3);
+				
+				data.put("name",name);
+				data.put("gt15_shortname",gt15_shortname);
+				data.put("gt15_chinesename",gt15_chinesename);
+				
+				data.put("orgpattern_name",orgpattern_name);
+				
+				if("集团".equals(orgpattern_number)){
+					orgpattern_number = "Group";
+				}else if("公司".equals(orgpattern_number)){
+					orgpattern_number = "Company";
+				}else if("部门".equals(orgpattern_number)){
+					orgpattern_number = "Dept";
+				}
+				data.put("orgpattern_number",orgpattern_number);
+				
+				data.put("fcomment",fcomment);
+				
+				data.put("structure",structures);
+				
+		        datas.add(data);   
+			}
+			 JSONObject paramJO = new JSONObject();
+	         paramJO.put("data",datas);
+	         paramJOStr = paramJO.toString();
+		}
+		return paramJOStr;
+	}
+	
+	
+	
+	 
+	/**
+	 * 新增:新增行政组织接口,推送到星瀚
+	 * @param ctx
+	 * @param accessToken
+	 * @throws Exception 
+	 */
+	public static String gt15_adminorg_add(Context ctx,String accessToken,String startDate, String endDate) throws Exception{
+		//获取请求地址
+		String gt15AdminOrgAddUrl = getGt15AdminOrgAddUrl();
+		
+		log.info("SynAdminOrgToERPUtils.gt15_adminorg_add.gt15AdminOrgAddUrl:"+gt15AdminOrgAddUrl);
+		//构建行政组织参数
+		String paramJOStr = getAdminOrgDetailEntry(ctx, startDate, endDate);
+		log.info("SynAdminOrgToERPUtils.gt15_adminorg_add.paramJOStr:"+paramJOStr);
+		//数据保存接口
+        String  responseMsg = HttpsReqUtil.postByHttps(gt15AdminOrgAddUrl, paramJOStr, accessToken);
+		
+		
+		return responseMsg;
+	}
+	
+	
+	/**
+	 * 新增:推送数据到ERP功能:主体
+	 * @return
+	 * @throws Exception 
+	 */
+	 public static String synAdminorgToErp(Context ctx,String startDate, String endDate ) throws Exception{
+		 
+		 //获取appToken
+		 String appToken = SynSalaryFromErpUtils.getAppToken(ctx);
+		 log.info("获取synAdminorgToErp.appToken:"+appToken);
+		 //获取accessToken
+		 String accessToken = SynSalaryFromErpUtils.getAccessToken(appToken);
+		 log.info("获取synAdminorgToErp.accessToken状态为:"+accessToken);
+		 //薪酬明细保存接口
+		 String responseMsg =  gt15_adminorg_add(ctx,accessToken, startDate,  endDate);
+		 log.info("synAdminorgToErp.responseMsg:"+accessToken);
+		 return null;
+	 }
+	
+	
+	 
+	 
+	 /**
+	  * 封存:获取封存行政组织的请求参数
+	  * @param ctx
+	  * @param startDate
+	  * @param endDate
+	  * @return
+	  * @throws BOSException
+	  * @throws SQLException
+	  */
+	 public static List<String> getAdminOrgBetaDetailEntry(Context ctx,String startDateStr, String endDateStr) throws BOSException, SQLException{
+		 //String sql = " select fnumber as number from  t_org_admin where fisousealup = 1 and fnumber not in ('D0003','D0002','D0039','D0040')";
+		
+		//获取前一天的0点时间字符串
+			String lastDateZeroTimeStr = "";
+			
+			//获取当前时间的字符串
+			String noeTimeStr = "";
+			
+			if(StringUtils.isEmpty(startDateStr)|| StringUtils.isEmpty(endDateStr) ){	
+				 //获取上次同步结束的时间
+				 lastDateZeroTimeStr =  SynPublicUtils.getLastUpdateSynTableTimeStrByEvenName(ctx,"synAdminOrgBetaToErp");
+				 
+				 if(StringUtils.isEmpty(lastDateZeroTimeStr)){
+					 //为空
+					//获取前一天的0点时间字符串
+					 lastDateZeroTimeStr = SynPublicUtils.getLastDateZeroTime();
+				 }
+				  
+				//更新最新 的时间为event_timeStamp,只有在自动触发的才会修改时间
+				 SynPublicUtils.updateSynTimeTable(ctx,"synAdminOrgBetaToErp");
+				 
+				//获取当前时间的字符串
+				 noeTimeStr = SynPublicUtils.getNowTimeStr();
+			}else{
+				 lastDateZeroTimeStr = startDateStr;
+				 noeTimeStr = endDateStr;
+			}
+		 
+		 
+		 String sql = " select fnumber as number from  t_org_admin where fisousealup = 1 " +
+		 		" and (flastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  flastupdatetime <=  {ts '"+noeTimeStr+"'})";
+		 log.info("getAdminOrgBetaDetailEntry.sql"+sql);
+		 IRowSet executeQuery = DbUtil.executeQuery(ctx, sql);
+		 List<String> numbers = new ArrayList<String>();
+		 if(executeQuery.size()>0){
+				while(executeQuery.next()){
+					String number = executeQuery.getString("number");					
+					numbers.add(number);
+				}				
+			} 
+		 return numbers;
+	 }
+	 
+	 /**
+	  * 封存:通过编码获取
+	  * @param numbers
+	  * @return
+	  */
+	 public static String getParamJOStrByNumber(String number){
+		 JSONObject data = new JSONObject();
+		 data.put("number", number);
+		 JSONObject paramJO = new JSONObject();
+         paramJO.put("data",data);
+         String paramJOStr  = paramJO.toString();
+		 return paramJOStr;
+	 }
+	 
+	 
+	 
+	 /**
+	  * 封存:根据编码封存行政组织
+	  * @param ctx
+	  * @param accessToken
+	  * @return
+	 * @throws Exception 
+	  */
+	 public static void synGt15_adminorg_beta(Context ctx,String accessToken,String startDate, String endDate) throws Exception{
+		 //获取请求地址
+		String gt15AdminOrgBetaUrl = getGt15AdminOrgBetaUrl();
+			
+		log.info("SynAdminOrgToERPUtils.synGt15_adminorg_beta.gt15AdminOrgBetaUrl:"+gt15AdminOrgBetaUrl);
+		//构建行政组织参数
+		List<String> numbers =getAdminOrgBetaDetailEntry(ctx, startDate, endDate);
+		log.info("SynAdminOrgToERPUtils.gt15_adminorg_add.numbers:"+numbers.size());
+		
+		for(String number : numbers){
+			String paramJOStr = getParamJOStrByNumber(number);
+			//数据保存接口
+			   String  responseMsg = HttpsReqUtil.postByHttps(gt15AdminOrgBetaUrl, paramJOStr, accessToken);
+		}		
+	   
+	 }
+	 
+	 
+	 
+	 
+	 
+	 
+	 
+	 /**
+	  * 封存:封存根据编码封存行政组织:主体
+	  * @param ctx
+	  * @return
+	  * @throws Exception
+	  */
+	 public static String syndminorgBetaToErp(Context ctx,String startDate, String endDate) throws Exception{
+		 //获取appToken
+		 String appToken = SynSalaryFromErpUtils.getAppToken(ctx);
+		 log.info("获取syndminorgBetaToErp.appToken:"+appToken);
+		 //获取accessToken
+		 String accessToken = SynSalaryFromErpUtils.getAccessToken(appToken);
+		 log.info("获取syndminorgBetaToErp.accessToken为:"+accessToken);
+		 //薪酬明细保存接口
+		 synGt15_adminorg_beta(ctx,accessToken,startDate,endDate);
+		 log.info("syndminorgBetaToErp.responseMsg:"+accessToken);
+		 
+		 return "";
+	 }
+	 
+	 
+	 
+	 
+	 
+	 
+	 
+	 
 }

+ 36 - 28
GDYSL/src/com/kingdee/eas/custom/erp/util/SynPersonToErpUtils.java

@@ -2,12 +2,9 @@ package com.kingdee.eas.custom.erp.util;
 
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 
+import com.kingdee.eas.util.ToolUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -88,7 +85,7 @@ public class SynPersonToErpUtils {
 	 * 新增:新增员工接口 主体
 	 * @throws Exception 
 	 */
-	public static void gt15_user_add(Context ctx,String  accessToken,String startDate, String endDate) throws Exception{
+	public static void gt15_user_add(Context ctx,String  accessToken,String startDate, String endDate,String pNumber) throws Exception{
 		//获取请求地址
 		String gt15UserAddUrl = getGt15AdminOrgBetaUrl();
 		log.info("SynPersonToErpUtils.gt15_user_add.gt15UserAddUrl:"+gt15UserAddUrl);
@@ -97,7 +94,7 @@ public class SynPersonToErpUtils {
 		log.info("SynPersonToErpUtils.gt15_user_add.startDate:"+startDate);
 		log.info("SynPersonToErpUtils.gt15_user_add.endDate:"+endDate);
 		//查询数据库,并构建新增人员参数,推送到星瀚
-		getUserAddEntryAndPush(ctx,gt15UserAddUrl,accessToken,startDate,endDate);
+		getUserAddEntryAndPush(ctx,gt15UserAddUrl,accessToken,startDate,endDate,pNumber);
 		
 	}
 		
@@ -131,7 +128,7 @@ public class SynPersonToErpUtils {
 	 * @return
 	 * @throws Exception 
 	 */
-	public static void getUserAddEntryAndPush(Context ctx,String gt15UserAddUrl,String accessToken,String startDateStr, String endDateStr) throws Exception{
+	public static void getUserAddEntryAndPush(Context ctx,String gt15UserAddUrl,String accessToken,String startDateStr, String endDateStr,String pNumber) throws Exception{
 		
 		//获取前一天的0点时间字符串
 		String lastDateZeroTimeStr = "";
@@ -159,6 +156,8 @@ public class SynPersonToErpUtils {
 			 noeTimeStr = endDateStr;
 		}
 		
+
+		
 		
 		log.info("SynPersonToErpUtils.lastDateZeroTimeStr:"+lastDateZeroTimeStr);
 		log.info("SynPersonToErpUtils.noeTimeStr:"+noeTimeStr);
@@ -193,26 +192,35 @@ public class SynPersonToErpUtils {
 				"  left join  CT_MP_WorkerCategory workerCategory on workerCategory.fid = temp.workercategoryId \n" +
 				"  left join CT_MP_Fullorpart fullOrPart2 on fullOrPart2.fid = empOrgRelation.CFFtorptID \n" +
 				"  left join T_HR_EmpLaborRelation empLaborRelation2 on empLaborRelation2.fpersonid = person.fid and  \n" +
-				"  empLaborRelation2.flaborrelationstateid in ('00000000-0000-0000-0000-000000000007A29E85B3','00000000-0000-0000-0000-000000000006A29E85B3','FTCmJT3SSRi1twufIaRb56KehbM=')\n" +
+				"  empLaborRelation2.flaborrelationstateid in ('00000000-0000-0000-0000-000000000007A29E85B3','00000000-0000-0000-0000-000000000006A29E85B3','FTCmJT3SSRi1twufIaRb56KehbM=')\n" ;
 				//"  where admin2.fnumber not in ('D0003','D0002','D0039','D0040','D0036') \n" +
 				
-				"  where (  (person.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  person.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
-				//"  or (fullOrPart.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  fullOrPart.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
-				//"  or (employeeClassify.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  employeeClassify.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
-				"  or (credentialsType.cflastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  credentialsType.cflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				//"  or (nationality.flastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  nationality.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
-				"  or (temp.aflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.aflastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
-				//"   or (temp.bflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.bflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				//"  or (temp.cflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.cflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				//"   or (temp.dflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.dflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				//"   or (temp.fflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.fflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				"   or (empLaborRelation.flastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  empLaborRelation.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				"   or (empOrgRelation.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  empOrgRelation.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				//"    or (admin2.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  admin2.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				"   or (workerCategory.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  workerCategory.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				//"   or (fullOrPart2.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  fullOrPart2.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
-				"   or (empLaborRelation2.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  empLaborRelation2.flastupdatetime <=  {ts '"+noeTimeStr+"'}))";
-		
+
+		if(!StringUtils.isEmpty(pNumber)) {
+			String[] split = pNumber.split(",");
+			List<String> pNumberList = Arrays.asList(split);
+			sql += " where person.fnumber in ( "+ ToolUtils.aryToStr(pNumberList,true) +" ) ";
+		}else{
+			sql += "  where (  (person.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  person.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
+					//"  or (fullOrPart.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  fullOrPart.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
+					//"  or (employeeClassify.flastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  employeeClassify.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
+					"  or (credentialsType.cflastupdatetime >  {ts '"+lastDateZeroTimeStr+"'} and  credentialsType.cflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					//"  or (nationality.flastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  nationality.flastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
+					"  or (temp.aflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.aflastupdatetime <=  {ts '"+noeTimeStr+"'} )\n" +
+					//"   or (temp.bflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.bflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					//"  or (temp.cflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.cflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					//"   or (temp.dflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.dflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					//"   or (temp.fflastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  temp.fflastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					"   or (empLaborRelation.flastupdatetime > {ts '"+lastDateZeroTimeStr+"'} and  empLaborRelation.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					"   or (empOrgRelation.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  empOrgRelation.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					//"    or (admin2.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  admin2.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					"   or (workerCategory.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  workerCategory.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					//"   or (fullOrPart2.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  fullOrPart2.flastupdatetime <=  {ts '"+noeTimeStr+"'})\n" +
+					"   or (empLaborRelation2.flastupdatetime> {ts '"+lastDateZeroTimeStr+"'} and  empLaborRelation2.flastupdatetime <=  {ts '"+noeTimeStr+"'}) ) " ;
+
+		}
+	 
+
 		log.info("SynPersonToErpUtils.getUserAddEntry.sql:"+sql);
 		String number = "";
 		String name_l1 = "";
@@ -440,7 +448,7 @@ public class SynPersonToErpUtils {
 	 * @return
 	 * @throws Exception 
 	 */
-	 public static void synPersonToErp(Context ctx ,String startDate, String endDate) throws Exception{
+	 public static void synPersonToErp(Context ctx ,String startDate, String endDate,String pNumber) throws Exception{
 		 
 		 //获取appToken
 		 String appToken = SynSalaryFromErpUtils.getAppToken(ctx);
@@ -449,7 +457,7 @@ public class SynPersonToErpUtils {
 		 String accessToken = SynSalaryFromErpUtils.getAccessToken(appToken);
 		 log.info("获取synPersonToErp.accessToken状态为:"+accessToken);
 		 //薪酬明细保存接口
-		  gt15_user_add(ctx,accessToken,startDate,endDate);
+		  gt15_user_add(ctx,accessToken,startDate,endDate,pNumber);
 		
 	 } 
 	

+ 34 - 6
GDYSL/src/com/kingdee/eas/custom/facade/employee/EmpPreEntryFacadeControllerBean.java

@@ -10,6 +10,9 @@ import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 import com.kingdee.bos.util.BOSUuid;
 import com.kingdee.eas.base.permission.UserFactory;
 import com.kingdee.eas.base.permission.UserInfo;
+import com.kingdee.eas.basedata.hraux.FolkCollection;
+import com.kingdee.eas.basedata.hraux.FolkFactory;
+import com.kingdee.eas.basedata.hraux.FolkInfo;
 import com.kingdee.eas.basedata.org.AdminOrgUnitInfo;
 import com.kingdee.eas.basedata.org.PositionFactory;
 import com.kingdee.eas.basedata.org.PositionInfo;
@@ -82,15 +85,19 @@ public class EmpPreEntryFacadeControllerBean extends AbstractEmpPreEntryFacadeCo
         preEntrySql.append(" FPreEnterDate,CFTryMonth,CFTrialStartDate,CFTransferDate,CFEmpTypeID,CFPersontypeID,CFWcategoryID,");
         preEntrySql.append(" CFFtorptID,CFLmanagerID,CFAdmintitle,CFAcademictitleID,CFJobsID,CFWaitcontract,CFLegalemployer,");
         preEntrySql.append(" CFExpatriate,CFResident,CFPaycurrency,CFHwage,CFFsmentitlement,CFFsentitlement,CFFaentitlement,a.CFJobGradeID,a.CFRmethodID,a.CFCountryRegionID, ");
-        preEntrySql.append(" a.cfjobendtime");
+        preEntrySql.append(" a.cfjobendtime ,   b.cfadjustinghours  adjustinghours ,  b.fconstellationid  constellation, b.fzodiacid  zodiac ,");
+        preEntrySql.append(" b.fidcardaddress idcardaddress , b.fidCardBeginDate idCardBeginDate ,b.fidCardEndDate  idCardEndDate ,b.cfgtiitemail gtiitemail , ");
+        preEntrySql.append(" b. ffolkid  folkid , b.fnativeplace_l2  nativeplace ");
         preEntrySql.append(" from T_HR_PreEntry as a ");
         preEntrySql.append(" left join T_HR_PreEntryPerson as b on a.FTALENTID  = b.fid	");
-        preEntrySql.append(" where fbillState = 3 and CFAutoConversion = 'Yes' and FIsGenerateEntryBill = 0 and FPREENTERDATE <= '" + baseDate + "'");
+        preEntrySql.append(" where fbillState = 3 and CFAutoConversion = 'Yes' and FIsGenerateEntryBill = 0  ");
         if (StringUtils.isNotBlank(empNumber)) {
-            preEntrySql.append(" a.CFEmpNumber = '" + empNumber + "' ");
+            preEntrySql.append(" and a.CFEmpNumber = '" + empNumber + "' ");
+        }else {
+        	preEntrySql.append(" and FPREENTERDATE <= '" + baseDate + "' ");
         }
-        if (StringUtils.isNotBlank(empNumber)) {
-            preEntrySql.append(" a.orgNumber = (select fid from t_org_admin where fnumber = '" + empNumber + "') ");
+        if (StringUtils.isNotBlank(orgNumber)) {
+            preEntrySql.append(" and a.orgNumber = (select fid from t_org_admin where fnumber = '" + orgNumber + "') ");
         }
         logger.error("预入职sql:" + preEntrySql);
         IRowSet rs = DbUtil.executeQuery(ctx, preEntrySql.toString());
@@ -281,7 +288,28 @@ public class EmpPreEntryFacadeControllerBean extends AbstractEmpPreEntryFacadeCo
                 }
                 //兼职类人员任职结束时间
                 empbizEntryInfo.put("jobEndTime", rs.getString("cfjobendtime"));
-
+                //20251014 身份证地址 	
+                empbizEntryInfo.put("idcardaddress", rs.getString("idcardaddress"));
+                //fidcardenddate   身份证终止有效期
+                empbizEntryInfo.put("idcardenddate", rs.getString("idCardEndDate"));
+                //fidcardstartdate   身份证起始有效期
+                empbizEntryInfo.put("idcardstartdate", rs.getString("idCardBeginDate"));
+                //fconstellationid	星座    fzodiacid 属相      cfadjustinghours  	
+                empbizEntryInfo.put("constellation", rs.getString("constellation"));
+                empbizEntryInfo.put("zodiac", rs.getString("zodiac"));
+                empbizEntryInfo.put("adjustinghours", rs.getString("adjustinghours"));
+                empbizEntryInfo.put("gtiitemail", rs.getString("gtiitemail"));
+                //b. ffolkid  folkid , b.fnativeplace_l2  nativeplace
+                empbizEntryInfo.put("nativePlace", rs.getString("nativeplace"));
+              
+                // 名族
+                if (StringUtils.isNotBlank(rs.getString("folkid"))) {
+                	FolkCollection folkCollection = FolkFactory.getLocalInstance(ctx).getFolkCollection("where id = '" + rs.getString("folkid") + "'");
+                    if (folkCollection != null && folkCollection.size() > 0) {
+                    	FolkInfo folkInfo = folkCollection.get(0);
+                    	empbizEntryInfo.setMyFolk(folkInfo)  ;
+                    }
+                }
 
                 empbizInfo.getEntrys().add(empbizEntryInfo);
                 logger.error("单据信息:" + empbizInfo.toString());