Merge branch 'master' of http://111.75.220.136:10030/turborao/jyyy

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/opplugin/PayBillToolUtil.java

@@ -103,7 +103,7 @@ public class PayBillToolUtil {
             data.put("PURPOSE", "用途：" + info.get("nckd_usage"));
 
             //费用类型
-            data.put("BUSS_TYPE", JSONObject.NULL);
+            data.put("BUSS_TYPE", info.get("nckd_buss_type")+"");
 
             //付款类型，工资  997
             if ("997".equals(info.get("paymenttype.number"))) {
@@ -279,15 +279,8 @@ public class PayBillToolUtil {
             }
         }
         data.put("PURPOSE", "用途：" + info.get("nckd_usage"));
-        //费用类型,取分录第一条费用项目编码
-        DynamicObjectCollection entrycoll = info.getDynamicObjectCollection("entry");
-        if (entrycoll.size() > 0) {
-            if (entrycoll.get(0).get("e_expenseitem.number") == null) {
-                data.put("BUSS_TYPE", "");
-            } else {
-                data.put("BUSS_TYPE", entrycoll.get(0).get("e_expenseitem.number") + "");
-            }
-        }
+
+        data.put("BUSS_TYPE", info.get("nckd_buss_type")+"");
 
 
         DynamicObject skyhinfo = BusinessDataServiceHelper.loadSingleFromCache(info.getDynamicObject("payeebank").getPkValue(), "bd_bebank");
@@ -299,7 +292,7 @@ public class PayBillToolUtil {
         data.put("RECE_CNAPS", skyhinfo.get("union_number") + "");
 
         //收款方户名
-        data.put("RECE_ACC_NAME", info.get("recaccbankname") + "");
+        data.put("RECE_ACC_NAME", info.get("payeename") + "");
         //收款方账号
         data.put("RECE_ACC_NO", info.get("payeebanknum") + "");