1、推送用友bip接口增加判断,如果是测试环境,不推送 2、金蝶人员与OA人员绑定定时任务增加获取职员类型数据
This commit is contained in:
parent
e430c5707d
commit
7b13ecca55
|
@ -139,9 +139,14 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
|
|||
//audit审核 syncbip手动同步 两种情况进入如下代码
|
||||
String eok = e.getOperationKey();
|
||||
if("audit".equals(eok) || "syncbip".equals(eok)){
|
||||
String accountId = RequestContext.get().getAccountId();//获取账套ID
|
||||
//如果是测试环境的路径就不触发推送bip
|
||||
if("2008012388581769216".equals(accountId)){
|
||||
return;
|
||||
}
|
||||
String contextUrl = System.getProperty("domain.contextUrl");
|
||||
//如果是测试环境的路径就不触发推送bip
|
||||
if(contextUrl != null && contextUrl.startsWith("http://isctest")){
|
||||
if(contextUrl != null && contextUrl.startsWith("https://isctest")){
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -267,6 +272,16 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
|
|||
return null;
|
||||
}
|
||||
|
||||
private String getOASuppNum(long supplierid){
|
||||
//resm_supplier_f7 表名 t_resm_supplier
|
||||
//resm_official_supplier 表名 t_resm_supplier
|
||||
DynamicObject supinfo = BusinessDataServiceHelper.loadSingle(supplierid,"resm_official_supplier","id,number,qeug_oacode");
|
||||
if(supinfo != null){
|
||||
return supinfo.getString("qeug_oacode");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private JSONObject zzPayData(String eventName, DynamicObject payrequestinfo, boolean isnotext){
|
||||
String[] companyDept = DobeDWUtils.getCompanyDeptNumber(payrequestinfo.getDynamicObject("usedepart").getString("number"));
|
||||
if(companyDept[0] == null){
|
||||
|
@ -300,7 +315,11 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
|
|||
supplierNum = payrequestinfo.getDynamicObject("multypereceiveunit").getString("number");
|
||||
supplierid = payrequestinfo.getDynamicObject("multypereceiveunit").getLong("id");
|
||||
}
|
||||
|
||||
// String suppOANum = getOASuppNum(supplierid);
|
||||
// if(!DobeDWUtils.isEmpty(suppOANum)){
|
||||
// //如果供应商的OA编号不为空,则传递给bip时,用此编号,而不用供应商的编号
|
||||
// supplierNum = suppOANum;
|
||||
// }
|
||||
payData.put("customer",supplierNum);//客户编码 即使是供应商也传入到该字段
|
||||
payData.put("pk_dept",companyDept[1]);//部门编码(通过公司主体明细表找部门编码)
|
||||
|
||||
|
|
|
@ -35,9 +35,11 @@ public class DobePersonOARealtionTask extends AbstractTask implements Plugin {
|
|||
public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
|
||||
//查找未绑定成功的人员
|
||||
QFilter dwFilter = new QFilter("source", QCP.equals, "dw");//来自数仓
|
||||
QFilter typeFilter = new QFilter("usertype", QCP.equals, "1");//usertype 人员类型 1-职员 3-供应商
|
||||
QFilter flagFilter = new QFilter("qeug_flag", QCP.equals, "0");//未与OA绑定
|
||||
QFilter enableFilter = new QFilter("enable", QCP.equals, "1");//用户未禁用
|
||||
DynamicObject[] dos = BusinessDataServiceHelper.load(entityName,"id,number,name",new QFilter[]{dwFilter,enableFilter,flagFilter});
|
||||
DynamicObject[] dos = BusinessDataServiceHelper.load(entityName,"id,number,name",
|
||||
new QFilter[]{enableFilter.and(flagFilter).and(dwFilter.or(typeFilter))});
|
||||
if(dos.length > 0){
|
||||
logger.info("本次需要绑定用户个数"+dos.length);
|
||||
DynamicObject userinfo;
|
||||
|
|
Loading…
Reference in New Issue