diff --git a/buildpackage/src/main/resources/application-dongj.yml b/buildpackage/src/main/resources/application-dongj.yml
index 28fa5bb3..a4e93212 100644
--- a/buildpackage/src/main/resources/application-dongj.yml
+++ b/buildpackage/src/main/resources/application-dongj.yml
@@ -12,7 +12,7 @@ spring:
dynamic:
datasource:
master:
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+ url: jdbc:mysql://115.239.174.22:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
password: 62e4295b615a30dbf3b8ee96f41c820b
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml
index aef79e6c..146859a0 100644
--- a/buildpackage/src/main/resources/application.yml
+++ b/buildpackage/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9999
+ port: 8901
servlet:
context-path: /kangarooDataCenterV3
localIP: 127.0.0.1
diff --git a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
index edf3f0b2..3205944c 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
@@ -31,6 +31,51 @@ public class ReceiptForEntity extends BaseEntity {
private String contractno;
private String djlxbm;//交易类型编码
private String pj_jsfs;//结算方式编码
+ private String scomment;//备注
+ private String zyx22;//合同号
+ private String zyx24;//合同名称
+ private String zyx28;//用途
+ private String szxmid;//收支项目
+
+ public String getSzxmid() {
+ return szxmid;
+ }
+
+ public void setSzxmid(String szxmid) {
+ this.szxmid = szxmid;
+ }
+
+ public String getZyx28() {
+ return zyx28;
+ }
+
+ public void setZyx28(String zyx28) {
+ this.zyx28 = zyx28;
+ }
+
+ public String getZyx22() {
+ return zyx22;
+ }
+
+ public void setZyx22(String zyx22) {
+ this.zyx22 = zyx22;
+ }
+
+ public String getZyx24() {
+ return zyx24;
+ }
+
+ public void setZyx24(String zyx24) {
+ this.zyx24 = zyx24;
+ }
+
+ public String getScomment() {
+ return scomment;
+ }
+
+ public void setScomment(String scomment) {
+ this.scomment = scomment;
+ }
public String getPj_jsfs() {
return pj_jsfs;
diff --git a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
index 9659424c..a13bf8f0 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
@@ -19,16 +19,21 @@
-
+
-
+
+
+
+
+
+
@@ -80,12 +85,17 @@
field0001 as r_djbh,
field0004 as r_wldx,
field0091 as r_deptid,
- field0060 as r_bfyhzh,
+ field0060 as dfyhzh,
field0062 as r_skyhmc,
field0014 as r_dfyhzh,
field0051 as r_fkyhmc,
field0073 as r_bzbm,
- field0092 as r_ywybm
+ field0068 as scomment,
+ field0042 as zyx22,
+ field0009 as zyx24,
+ field0092 as r_ywybm,
+ field0096 as szxmid,
+ field0058 as zyx28
from formmain_0045
where field0089 is null
and finishedflag = '1'
diff --git a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
index 36564a0f..f6f9ed3d 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
@@ -211,10 +211,15 @@ public class ReceiptForServiceImpl extends BaseService
//parentvo.put("wldx",rec.getWldx());
parentvo.put("deptid",rec.getDeptid());
//parentvo.put("ywybm",rec.getYwybm());
- parentvo.put("bfyhzh",rec.getBfyhzh());
+ parentvo.put("bfyhzh",rec.getBfyhzh());//本方银行账号
parentvo.put("skyhmc",rec.getSkyhmc());//收款银行账号
parentvo.put("pj_jsfs",rec.getPj_jsfs());//结算方式
- //parentvo.put("dfyhzh",rec.getDfyhzh());
+ parentvo.put("dfyhzh",rec.getDfyhzh());//对方银行账号
+ parentvo.put("scomment",rec.getScomment());//备注
+ parentvo.put("zyx22",rec.getZyx22());//合同号
+ parentvo.put("zyx24",rec.getZyx24());//合同名称
+ parentvo.put("zyx28",rec.getZyx28());//用途
+ parentvo.put("szxmid",rec.getSzxmid());//收支项目
parentvo.put("fkyhmc",rec.getFkyhmc());
parentvo.put("bzbm",rec.getBzbm());
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
index a4948dd0..12f50559 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
@@ -105,10 +105,10 @@ public class ComparisonServiceImpl extends BaseService
//查询主表数据
List> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
- //递归查询组织树
- if(comparisonEntities.get(0).getViewName().equals("1")){
- return recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
- }
+// //递归查询组织树
+// if(comparisonEntities.get(0).getViewName().equals("1")){
+// return recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
+// }
if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
for (Map comparisonEntitiePage : comparisonEntitiePages) {