Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
17f5956972
|
|
@ -24,9 +24,19 @@ public class ContractManagerAssignerTaskPlugin extends AbstractTask {
|
||||||
"id,project,zcgj_projectmanager", new QFilter[]{qFilter1});//收入合同
|
"id,project,zcgj_projectmanager", new QFilter[]{qFilter1});//收入合同
|
||||||
if (ec_in_contracts != null && ec_in_contracts.length > 0) {
|
if (ec_in_contracts != null && ec_in_contracts.length > 0) {
|
||||||
for (DynamicObject ec_in_contract : ec_in_contracts) {
|
for (DynamicObject ec_in_contract : ec_in_contracts) {
|
||||||
String projectNumber = ec_in_contract.getDynamicObject("project").getString("number");//收入合同-项目-项目编号
|
DynamicObject project = ec_in_contract.getDynamicObject("project");
|
||||||
|
if (project == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String projectNumber = project.getString("number");//收入合同-项目-项目编号
|
||||||
|
if (projectNumber == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
QFilter[] qFilter11 = new QFilter[]{new QFilter("billno", QCP.equals, projectNumber)};
|
QFilter[] qFilter11 = new QFilter[]{new QFilter("billno", QCP.equals, projectNumber)};
|
||||||
DynamicObject ec_project = BusinessDataServiceHelper.loadSingle("ec_project", "id,zcgj_pm", qFilter11);//项目
|
DynamicObject ec_project = BusinessDataServiceHelper.loadSingle("ec_project", "id,zcgj_pm", qFilter11);//项目
|
||||||
|
if (ec_project == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
DynamicObject zcgj_pm = ec_project.getDynamicObject("zcgj_pm");//项目-项目负责人
|
DynamicObject zcgj_pm = ec_project.getDynamicObject("zcgj_pm");//项目-项目负责人
|
||||||
ec_in_contract.set("zcgj_projectmanager", zcgj_pm);//收入合同-项目负责人
|
ec_in_contract.set("zcgj_projectmanager", zcgj_pm);//收入合同-项目负责人
|
||||||
}
|
}
|
||||||
|
|
@ -39,9 +49,19 @@ public class ContractManagerAssignerTaskPlugin extends AbstractTask {
|
||||||
"id,project,zcgj_projectmanager", new QFilter[]{qFilter2});//支出合同
|
"id,project,zcgj_projectmanager", new QFilter[]{qFilter2});//支出合同
|
||||||
if (ec_out_contracts != null && ec_out_contracts.length > 0) {
|
if (ec_out_contracts != null && ec_out_contracts.length > 0) {
|
||||||
for (DynamicObject ec_out_contract : ec_out_contracts) {
|
for (DynamicObject ec_out_contract : ec_out_contracts) {
|
||||||
String projectNumber = ec_out_contract.getDynamicObject("project").getString("number");//支出合同-项目-项目编号
|
DynamicObject project = ec_out_contract.getDynamicObject("project");
|
||||||
|
if (project == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String projectNumber = project.getString("number");//支出合同-项目-项目编号
|
||||||
|
if (projectNumber == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
QFilter[] qFilter22 = new QFilter[]{new QFilter("billno", QCP.equals, projectNumber)};
|
QFilter[] qFilter22 = new QFilter[]{new QFilter("billno", QCP.equals, projectNumber)};
|
||||||
DynamicObject ec_project = BusinessDataServiceHelper.loadSingle("ec_project", "id,zcgj_pm", qFilter22);//项目
|
DynamicObject ec_project = BusinessDataServiceHelper.loadSingle("ec_project", "id,zcgj_pm", qFilter22);//项目
|
||||||
|
if (ec_project == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
DynamicObject zcgj_pm = ec_project.getDynamicObject("zcgj_pm");//项目-项目负责人
|
DynamicObject zcgj_pm = ec_project.getDynamicObject("zcgj_pm");//项目-项目负责人
|
||||||
ec_out_contract.set("zcgj_projectmanager", zcgj_pm);//支出合同-项目负责人
|
ec_out_contract.set("zcgj_projectmanager", zcgj_pm);//支出合同-项目负责人
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue