不动产租赁发票调整

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java

@@ -390,7 +390,7 @@ public class BillInfo extends BaseEntity
     @TableField(exist=false)
     private List<Hwys> hwysList; // 货物运输
     @TableField(exist=false)
-    private List<Bdcxsxx> bdcxsxxListt; // 不动产销售信息
+    private List<Bdcxsxx> bdcxsxxList; // 不动产销售信息
     @TableField(exist=false)
     private List<Jzfwxx> jzfwList; // 建筑服务信息
 
@@ -582,12 +582,12 @@ public class BillInfo extends BaseEntity
         this.hwysList = hwysList;
     }
 
-    public List<Bdcxsxx> getBdcxsxxListt() {
-        return bdcxsxxListt;
+    public List<Bdcxsxx> getBdcxsxxList() {
+        return bdcxsxxList;
     }
 
-    public void setBdcxsxxListt(List<Bdcxsxx> bdcxsxxListt) {
-        this.bdcxsxxListt = bdcxsxxListt;
+    public void setBdcxsxxList(List<Bdcxsxx> bdcxsxxList) {
+        this.bdcxsxxList = bdcxsxxList;
     }
 
     public List<Jzfwxx> getJzfwList() {

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java

@@ -43,7 +43,7 @@ public class Qdtxx {
 
     private List<Fjys> FJYSLIST; // 附加要素列表
     private List<Hwys> HWYSLIST; // 货物运输
-    private List<Bdcxsxx> BDCXSXX; // 不动产销售信息
+    private Bdcxsxx BDCXSXX; // 不动产销售信息
     private Jzfwxx JZFWXX; // 建筑服务信息
     private Bdczlxx BDCZLXX; // 建筑服务信息
 

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

@@ -218,11 +218,14 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         qdtxx.setQydm(billInfo.getDqbm());
         qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表
         qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输
-        qdtxx.setBDCXSXX(billInfo.getBdcxsxxListt());// 不动产销售信息
-        if(billInfo.getJzfwList() != null && billInfo.getJzfwList().size() > 0 ){
+
+        if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){
+            qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息
+        }
+        if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){
             qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息
         }
-        if(billInfo.getBdczlxxList() != null && billInfo.getBdczlxxList().size() > 0 ){
+        if(billInfo.getBdczlxxList() != null && !billInfo.getBdczlxxList().isEmpty()){
             qdtxx.setBDCZLXX(billInfo.getBdczlxxList().get(0));// 不动产租赁信息
         }
 //        qdtxx.setBDCZLXX(billInfo.getBdczlxxList()); //不动产租赁信息
@@ -232,7 +235,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) {
             //GenerateQdHwysInvoice 货物运输
             url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE;
-        } else if (CollectionUtils.isNotEmpty(qdtxx.getBDCXSXX())) {
+        } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) {
             // GenerateQdBdcxsInvoice 不动产销售信息
             url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE;
         } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {