hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

This commit is contained in:
xiang2lin 2024-09-20 10:09:20 +08:00
parent 86aac2c3f5 8a3dcc44ab
commit 917ea1fa5d
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
View File

@ -29,8 +29,24 @@ public class ReceiptForEntity extends BaseEntity {
private String ddh;
private String bbhl;
private String contractno;
private String djlxbm;//交易类型编码
private String pj_jsfs;//结算方式编码
public String getPj_jsfs() {
return pj_jsfs;
}
public void setPj_jsfs(String pj_jsfs) {
this.pj_jsfs = pj_jsfs;
}
public String getDjlxbm() {
return djlxbm;
}
public void setDjlxbm(String djlxbm) {
this.djlxbm = djlxbm;
}
public String getDfbbje() {
return dfbbje;

6
service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
View File

@ -12,6 +12,8 @@
<result property="lrr" column="r_lrr" jdbcType="VARCHAR"/>
<result property="shr" column="r_shr" jdbcType="VARCHAR"/>
<result property="shrq" column="r_shrq" jdbcType="VARCHAR"/>
<result property="djlxbm" column="djlxbm" jdbcType="VARCHAR"/>
<result property="pj_jsfs" column="pj_jsfs" jdbcType="VARCHAR"/>
<result property="djbh" column="r_djbh" jdbcType="VARCHAR"/>
<result property="wldx" column="r_wldx" jdbcType="INTEGER"/>
@ -70,6 +72,9 @@
field0013 as r_dfbbje,
field0011 as r_dfybje,
field0019 as r_fph,
'D2' as djlxbm,
field0095 as pj_jsfs,
field0014 as bfyhzh,
field0059 as r_zy,
field0073 as r_bzbm_code,
field0001 as r_djbh,
@ -83,6 +88,7 @@
field0092 as r_ywybm
from formmain_0045
where field0089 is null
and finishedflag = '1'
<trim>
<if test="id !=null and id!=''">and id like concat('%',#{id},'%')</if>
</trim>

6
service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
View File

@ -203,6 +203,7 @@ public class ReceiptForServiceImpl extends BaseService<ReceiptForEntity,String>
parentvo.put("dwbm",rec.getDwbm());
parentvo.put("hbbm",rec.getHbbm());
parentvo.put("lrr",rec.getLrr());
parentvo.put("djlxbm",rec.getDjlxbm());//交易类型编码
parentvo.put("shr",rec.getShr());
parentvo.put("shrq",rec.getShrq().substring(0,10));
@ -210,8 +211,9 @@ public class ReceiptForServiceImpl extends BaseService<ReceiptForEntity,String>
//parentvo.put("wldx",rec.getWldx());
parentvo.put("deptid",rec.getDeptid());
//parentvo.put("ywybm",rec.getYwybm());
//parentvo.put("bfyhzh",rec.getBfyhzh());
parentvo.put("skyhmc",rec.getSkyhmc());
parentvo.put("bfyhzh",rec.getBfyhzh());
parentvo.put("skyhmc",rec.getSkyhmc());//收款银行账号
parentvo.put("pj_jsfs",rec.getPj_jsfs());//结算方式
//parentvo.put("dfyhzh",rec.getDfyhzh());
parentvo.put("fkyhmc",rec.getFkyhmc());
parentvo.put("bzbm",rec.getBzbm());