Merge remote-tracking branch 'origin/dev' into dev

mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java

@@ -255,8 +255,8 @@ public class BillingStatementApplicationService {
                     billingStatementDO.setSecondSubjectCode(expenseAccountPO.getSubjectCode());
                     billingStatementDO.setSecondSubjectName(expenseAccountPO.getSubjectName());
                 }
-                billingStatementDO.setBelongModuleCode(expenseAccountPO.getBelongModuleCode());
+                //billingStatementDO.setBelongModuleCode(expenseAccountPO.getBelongModuleCode());
-                billingStatementDO.setBelongModule(expenseAccountPO.getBelongModule());
+                //billingStatementDO.setBelongModule(expenseAccountPO.getBelongModule());
             }
         }
         //根据结算对象id查询结算对象数据，并赋值
@@ -615,4 +615,4 @@ public class BillingStatementApplicationService {
         }
         return billingStatementDomainService.getBillDetailsList(billingStatementDO);
     }
-}
+}

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java

@@ -203,5 +203,7 @@ public class BmsInvoiceList extends BaseVOEntity {
     @ApiModelProperty(value = "一级组织ID")
     @Excel(name = "一级组织ID", width = 15)
     private Long topOrganizationId;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 
 }

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListAddDTO.java

@@ -70,6 +70,9 @@ public class BmsInvoiceListAddDTO implements Serializable {
     @Excel(name = "对账单金额", width = 15)
     private BigDecimal billAmount;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
     private List<BmsMakeOutInvoice> bmsMakeOutInvoices;
 
 }

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java

@@ -129,6 +129,8 @@ public class BmsInvoiceListDTO implements Serializable {
     @ApiModelProperty(value = "所属部门")
 	@Excel(name = "所属部门", width = 15)
     private String sysOrgCode;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 
     /**开票表集合*/
     @ApiModelProperty(value = "开票表集合")

mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml

@@ -124,6 +124,7 @@
         a.invoice_code,
         a.tracking_number,
         a.apply_number,
+        a.SETTLEMENT_CURRENCY as settlementCurrency,
         a.organization_id AS organizationId,
         a.organization_name AS organizationName,
         a.tax_reg_account AS taxRegAccount,