diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java
index 4776058c..d3637a10 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java
@@ -25,7 +25,10 @@ public class AgentPaymentDetailEntity extends BaseEntity {
//明细序号,从1开始递增
private int dtlSeqNum;
-
+ //明细用途
+ private String dtlPurpose;
+ //是否跨行 Y表示跨行 N表示同行
+ private String dtlBankFlag;
//支付结果
private String payResult;
//支付日期
@@ -110,4 +113,20 @@ public class AgentPaymentDetailEntity extends BaseEntity {
public void setPayDate(String payDate) {
this.payDate = payDate;
}
+
+ public String getDtlPurpose() {
+ return dtlPurpose;
+ }
+
+ public void setDtlPurpose(String dtlPurpose) {
+ this.dtlPurpose = dtlPurpose;
+ }
+
+ public String getDtlBankFlag() {
+ return dtlBankFlag;
+ }
+
+ public void setDtlBankFlag(String dtlBankFlag) {
+ this.dtlBankFlag = dtlBankFlag;
+ }
}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml
index 43869fc1..3b9526f6 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml
@@ -11,6 +11,8 @@
+
+
@@ -25,6 +27,8 @@
dtlCnapsCode,
dtlRevName,
dtlRevBankName,
+ dtlPurpose,
+ dtlBankFlag,
payResult,
payDate
@@ -39,16 +43,19 @@
formson_0225.id,
formson_0225.formmain_id AS formmainId,
'formson_0225' AS tabName,
+ 'N' AS dtlBankFlag,
formson_0225.field0001 AS dtlSeqNum,
formson_0225.field0019 AS dtlAmount,
formson_0225.field0036 AS dtlRevAccount,
formson_0225.field0035 AS dtlCnapsCode,
formson_0225.field0037 AS dtlRevName,
formson_0225.field0034 AS dtlRevBankName,
+ to_char(formmain_0224.field0030,'yyyy-MM')||'月'||'工资'AS dtlPurpose,
formson_0225.field0044 AS payResult,
formson_0225.field0045 AS payDate
FROM
formson_0225
+ LEFT JOIN formmain_0224 ON formmain_0224.id = formson_0225.formmain_id
)formson_0225
formson_0225.id = #{id}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
index 65b9ea9a..be06fc7b 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
@@ -40,6 +40,8 @@ public class AgentPaymentEntity extends BaseEntity {
private String tableName;//表名称
private String billName;//单据名称
+ private String payBankType;//付款银行类型
+
public String getReferenceNum() {
return referenceNum;
}
@@ -151,4 +153,12 @@ public class AgentPaymentEntity extends BaseEntity {
public void setPayDate(String payDate) {
this.payDate = payDate;
}
+
+ public String getPayBankType() {
+ return payBankType;
+ }
+
+ public void setPayBankType(String payBankType) {
+ this.payBankType = payBankType;
+ }
}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
index e83daca0..a74d8911 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
@@ -27,6 +27,7 @@
busType,
amount,
currency,
+ payBankType,
payAccount,
applyCode,
payResult,
@@ -52,7 +53,8 @@
'755915707610112' AS payAccount,
formmain_0224.field0043 AS applyCode,
formmain_0224.field0046 AS payResult,
- '工资' AS purpose
+ formmain_0224.field0053 as payBankType,
+ to_char(formmain_0224.field0030,'yyyy-MM')||'月'||''工资' AS purpose
FROM
formmain_0224
LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0224.id