Merge remote-tracking branch 'origin/master'

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/ContractbillApiPlugin.java

@@ -125,7 +125,7 @@ public class ContractbillApiPlugin implements Serializable {
         dynamicObject.set("billstatus","A"); // 单据状态， A-暂存,E-审核通过
         //单据其他业务字段赋值
         // 甲方：ftaxregnum 纳税识别号
-        DynamicObject company = BusinessDataServiceHelper.loadSingle("bos_org","id,name",new QFilter[]{new QFilter("ftaxregnum",QCP.equals,fjiafangxinyongcode)});
+        DynamicObject company = BusinessDataServiceHelper.loadSingle("bos_org","id,name",new QFilter[]{new QFilter("uniformsocialcreditcode",QCP.equals,fjiafangxinyongcode)});
         dynamicObject.set("company",company); // 公司
 
         DynamicObject stdbilltype = BusinessDataServiceHelper.loadSingle("bos_billtype","id,name",new QFilter[]{new QFilter("number",QCP.equals,"er_contractbill_BT_S")});
@@ -133,7 +133,7 @@ public class ContractbillApiPlugin implements Serializable {
 
         dynamicObject.set("detailtype","biztype_applybill"); //（影响列表记录显示） 单据类型:biztype_applybill 合同台账 ,biztype_changebill 合同变更,biztype_stopbill 合同终止
 
-        DynamicObject contracttype = BusinessDataServiceHelper.loadSingle("pmct_conttype","id,name",new QFilter[]{new QFilter("number",QCP.equals,"FYHT")});
+        DynamicObject contracttype = BusinessDataServiceHelper.loadSingle("pmct_conttype","id,name",new QFilter[]{new QFilter("number",QCP.equals,"JYCONTYPE")});
         dynamicObject.set("contracttype",contracttype); // 合同类型
         dynamicObject.set("contractcode",fcontractcode); // 合同号
         dynamicObject.set("contractname",fcontractname); // 合同名称
@@ -164,7 +164,7 @@ public class ContractbillApiPlugin implements Serializable {
         DynamicObject[] huilvAry = BusinessDataServiceHelper.load("bd_exrate_tree","id,orgcur,cur,excval,effectdate",
                 new QFilter[]{new QFilter("orgcur",QCP.equals,bizhong.getLong("id"))
                         .and("cur",QCP.equals,CNY.getLong("id"))
-                        .and("enable",QCP.equals,CNY.getLong("id"))},"effectdate desc");
+                        .and("enable",QCP.equals,'1')},"effectdate desc");
 
         BigDecimal huilv = new BigDecimal(0);
         if(huilvAry.length > 0) {