zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhangzhiguo 2025-09-29 17:11:37 +08:00
parent 8234d1f570 0c74a4670b
commit b18d4b68ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java
View File

@ -235,15 +235,15 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
qFilter.add(new QFilter("billstatus", QCP.equals, "C")); qFilter.add(new QFilter("billstatus", QCP.equals, "C"));
formShowParameter.getListFilterParameter().setQFilters(qFilter); formShowParameter.getListFilterParameter().setQFilters(qFilter);
}else if("zcgj_maintenanceack".equals(propertyName)){//维修确认单 }else if("zcgj_maintenanceack".equals(propertyName)){//维修确认单
DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid"); // DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");//往来单位
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany"); DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
List<QFilter> qFilter = new ArrayList<>(); List<QFilter> qFilter = new ArrayList<>();
if(billpayerid!=null){ /* if(billpayerid!=null){
Long payerid = billpayerid.getLong("id"); Long payerid = billpayerid.getLong("id");
//qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid)); //qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid));
qFilter.add(new QFilter("zcgj_partb", QCP.equals, payerid));//供应商 qFilter.add(new QFilter("zcgj_partb", QCP.equals, payerid));//供应商
} }*/
if(costcompany!=null){ if(costcompany!=null){
Long companyId = costcompany.getLong("id"); Long companyId = costcompany.getLong("id");
qFilter.add(new QFilter("zcgj_accountorg", QCP.equals, companyId)); qFilter.add(new QFilter("zcgj_accountorg", QCP.equals, companyId));