diff --git a/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucher.java b/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucher.java index 00a23a11..b2138afe 100644 --- a/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucher.java +++ b/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucher.java @@ -4,12 +4,21 @@ import java.util.List; public class BipVoucher { private List details; + private List detail; private String no; private String pk_corp; private String pk_glorgbook; private String pk_prepared; private String pk_vouchertype; private String pk_voucher; + private String period; + private String vouchertype; + private String attachment; + private String year; + private String prepared; + private String prepareddate; + private String num; + private String accbookCode; public List getDetails() { return details; @@ -66,4 +75,76 @@ public class BipVoucher { public void setPk_voucher(String pk_voucher) { this.pk_voucher = pk_voucher; } + + public List getDetail() { + return detail; + } + + public void setDetail(List detail) { + this.detail = detail; + } + + public String getPeriod() { + return period; + } + + public void setPeriod(String period) { + this.period = period; + } + + public String getVouchertype() { + return vouchertype; + } + + public void setVouchertype(String vouchertype) { + this.vouchertype = vouchertype; + } + + public String getAttachment() { + return attachment; + } + + public void setAttachment(String attachment) { + this.attachment = attachment; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getPrepared() { + return prepared; + } + + public void setPrepared(String prepared) { + this.prepared = prepared; + } + + public String getPrepareddate() { + return prepareddate; + } + + public void setPrepareddate(String prepareddate) { + this.prepareddate = prepareddate; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + public String getAccbookCode() { + return accbookCode; + } + + public void setAccbookCode(String accbookCode) { + this.accbookCode = accbookCode; + } } \ No newline at end of file diff --git a/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucherDetails.java b/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucherDetails.java index ff8cf3e6..252b7fba 100644 --- a/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucherDetails.java +++ b/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucherDetails.java @@ -14,6 +14,15 @@ public class BipVoucherDetails { private String pk_currtype; private String debitquantity; private String price; + private String accountCode; + private String amount; + private String globalcreditamount; + private String globaldebitamount; + private String groupdebitamount; + private String currtypeCode; + private String busidate; + private String groupcreditamount; + private String detailindex; public List getAss() { return ass; @@ -102,4 +111,76 @@ public class BipVoucherDetails { public void setPrice(String price) { this.price = price; } + + public String getAccountCode() { + return accountCode; + } + + public void setAccountCode(String accountCode) { + this.accountCode = accountCode; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } + + public String getGlobalcreditamount() { + return globalcreditamount; + } + + public void setGlobalcreditamount(String globalcreditamount) { + this.globalcreditamount = globalcreditamount; + } + + public String getGlobaldebitamount() { + return globaldebitamount; + } + + public void setGlobaldebitamount(String globaldebitamount) { + this.globaldebitamount = globaldebitamount; + } + + public String getGroupdebitamount() { + return groupdebitamount; + } + + public void setGroupdebitamount(String groupdebitamount) { + this.groupdebitamount = groupdebitamount; + } + + public String getCurrtypeCode() { + return currtypeCode; + } + + public void setCurrtypeCode(String currtypeCode) { + this.currtypeCode = currtypeCode; + } + + public String getBusidate() { + return busidate; + } + + public void setBusidate(String busidate) { + this.busidate = busidate; + } + + public String getGroupcreditamount() { + return groupcreditamount; + } + + public void setGroupcreditamount(String groupcreditamount) { + this.groupcreditamount = groupcreditamount; + } + + public String getDetailindex() { + return detailindex; + } + + public void setDetailindex(String detailindex) { + this.detailindex = detailindex; + } } \ No newline at end of file diff --git a/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207BillServiceImpl.java b/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207BillServiceImpl.java index d5858c28..1511d1ee 100644 --- a/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207BillServiceImpl.java +++ b/fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207BillServiceImpl.java @@ -77,9 +77,9 @@ public class BipV32207BillServiceImpl extends BaseService im String bodys = entity.getBodys(); BipVoucher voucher = JSONObject.parseObject(bodys, BipVoucher.class); List fzhs = Arrays.asList(new String[]{"0012", "0006", "0004"}); - if (voucher.getDetails() != null && voucher.getDetails().size() > 0) { - for (int a = 0; a < voucher.getDetails().size(); a++) { - BipVoucherDetails voucherDetails = voucher.getDetails().get(a); + if (voucher.getDetail() != null && voucher.getDetail().size() > 0) { + for (int a = 0; a < voucher.getDetail().size(); a++) { + BipVoucherDetails voucherDetails = voucher.getDetail().get(a); if (voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0) { for (int b = 0; b < voucherDetails.getAss().size(); b++) { BipAss ass = voucherDetails.getAss().get(b); @@ -91,7 +91,7 @@ public class BipV32207BillServiceImpl extends BaseService im archivesEntity.setLeftCode(ass.getCheckvaluecode()); archivesEntity.setLeftOrg(voucher.getPk_corp()); - List archivesEntities = bipArchivesDao.queryArchivesData(archivesEntity); + List archivesEntities = bipArchivesDao.queryArchivesDatays(archivesEntity); if (archivesEntities != null && archivesEntities.size() > 0) { ass.setCheckvaluecode(archivesEntities.get(0).getRightCode()); }