diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/po/SettlementCustomersPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/po/SettlementCustomersPO.java index 4950e5455..2d497c5cc 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/po/SettlementCustomersPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/po/SettlementCustomersPO.java @@ -96,4 +96,35 @@ public class SettlementCustomersPO extends BaseVOEntity{ @ApiModelProperty(name = "结算币种") private String settlementCurrency; + @ApiModelProperty("业务单据id") + private Long businessDocumentId; + + @ApiModelProperty("业务流水号") + private String businessFlow; + + @ApiModelProperty("业务单号") + private String originalBusinessNum; + + @ApiModelProperty("费用类别") + private String serviceItemsName; + + @ApiModelProperty("一级费用科目") + private String firstSubjectName; + + @ApiModelProperty("二级费用科目") + private String secondSubjectName; + + @ApiModelProperty("业务状态（1-未生效，2-已生效，3-已计费，4-已驳回，5-已作废）") + private Integer businessState; + + @ApiModelProperty("单据类型") + private String documentType; + + @ApiModelProperty("单据类型编码") + private String documentTypeCode; + + @ApiModelProperty("业务单据创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date businessCreateTime; + } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/todo/SettlementCustomersDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/todo/SettlementCustomersDO.java index fa4454ba9..2546f6c99 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/todo/SettlementCustomersDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/todo/SettlementCustomersDO.java @@ -105,4 +105,28 @@ public class SettlementCustomersDO extends BaseVOEntity{ @ApiModelProperty(name = "nc编码") private String ncCode; + @ApiModelProperty("业务流水号") + private String businessFlow; + + @ApiModelProperty("业务单号") + private String originalBusinessNum; + + @ApiModelProperty("费用类别") + private String serviceItemsName; + + @ApiModelProperty("一级费用科目") + private String firstSubjectName; + + @ApiModelProperty("二级费用科目") + private String secondSubjectName; + + @ApiModelProperty("业务状态（1-未生效，2-已生效，3-已计费，4-已驳回，5-已作废）") + private Integer businessState; + + @ApiModelProperty("单据类型") + private String documentType; + + @ApiModelProperty("单据类型编码") + private String documentTypeCode; + } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/settlementCustomers/SettlementCustomersDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/settlementCustomers/SettlementCustomersDTO.java index 4094cc9fe..f347cd0a4 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/settlementCustomers/SettlementCustomersDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/settlementCustomers/SettlementCustomersDTO.java @@ -103,4 +103,28 @@ public class SettlementCustomersDTO extends BaseVOEntity{ private String projectName; @ApiModelProperty(name = "nc编码") private String ncCode; + + @ApiModelProperty("业务流水号") + private String businessFlow; + + @ApiModelProperty("业务单号") + private String originalBusinessNum; + + @ApiModelProperty("费用类别") + private String serviceItemsName; + + @ApiModelProperty("一级费用科目") + private String firstSubjectName; + + @ApiModelProperty("二级费用科目") + private String secondSubjectName; + + @ApiModelProperty("业务状态（1-未生效，2-已生效，3-已计费，4-已驳回，5-已作废）") + private Integer businessState; + + @ApiModelProperty("单据类型") + private String documentType; + + @ApiModelProperty("单据类型编码") + private String documentTypeCode; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/SettlementCustomersApi.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/SettlementCustomersApi.java index 0b0e45aec..ed2fa4bbf 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/SettlementCustomersApi.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/SettlementCustomersApi.java @@ -41,9 +41,8 @@ public class SettlementCustomersApi extends BaseController{ @GetMapping("/list") public TableDataInfo list(SettlementCustomersDTO settlementCustomersDTO) { - //转换实体 SettlementCustomersDO settlementCustomersDO = new SettlementCustomersDO(); - BeanUtils.copyProperties(settlementCustomersDTO,settlementCustomersDO); + BeanUtils.copyProperties(settlementCustomersDTO, settlementCustomersDO); startPage(); List list = settlementCustomersApplicationService.queryList(settlementCustomersDO); return getDataTable(list); diff --git a/mhd_bms/src/main/resources/mapper/BillingStatementMapper.xml b/mhd_bms/src/main/resources/mapper/BillingStatementMapper.xml index a476f318f..a7a274c01 100644 --- a/mhd_bms/src/main/resources/mapper/BillingStatementMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BillingStatementMapper.xml @@ -116,9 +116,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND billing_flow like concat('%', #{billingStatementDO.billingFlow}, '%') + + AND business_flow like concat('%', #{billingStatementDO.businessFlow}, '%') + AND settlement_entity like concat('%', #{billingStatementDO.settlementEntity}, '%') + + AND settlement_customers_code like concat('%', #{billingStatementDO.settlementCustomersCode}, '%') + + + AND first_subject_name like concat('%', #{billingStatementDO.firstSubjectName}, '%') + AND( first_subject_name like concat('%', #{billingStatementDO.secondSubjectName}, '%') OR second_subject_name like concat('%', #{billingStatementDO.secondSubjectName}, '%') ) @@ -129,9 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND account_expense_type = #{billingStatementDO.accountExpenseType} - - AND settlement_customers_code = #{billingStatementDO.settlementCustomersCode} - AND belong_module_code = #{billingStatementDO.belongModuleCode} @@ -151,6 +157,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND document_type like concat('%', #{billingStatementDO.documentType}, '%') + + AND document_type_code = #{billingStatementDO.documentTypeCode} + + + AND service_items_code = #{billingStatementDO.serviceItemsCode} + AND original_business_num like concat('%', #{billingStatementDO.originalBusinessNum}, '%') diff --git a/mhd_bms/src/main/resources/mapper/BusinessDocumentMapper.xml b/mhd_bms/src/main/resources/mapper/BusinessDocumentMapper.xml index e38a07668..9c6f2ffcc 100644 --- a/mhd_bms/src/main/resources/mapper/BusinessDocumentMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BusinessDocumentMapper.xml @@ -181,6 +181,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND settlement_entity like concat('%', #{businessDocumentDO.settlementEntity}, '%') + + AND settlement_customers_code like concat('%', #{businessDocumentDO.settlementCustomersCode}, '%') + + + AND service_items_name like concat('%', #{businessDocumentDO.serviceItemsName}, '%') + + + AND service_items_code = #{businessDocumentDO.serviceItemsCode} + + + AND document_type_code = #{businessDocumentDO.documentTypeCode} + and business_document_id in diff --git a/mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml b/mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml index 01a8a0035..750523150 100644 --- a/mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml +++ b/mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml @@ -32,71 +32,85 @@ + + + + + + + + + + - - select * from settlement_customers - - - - - - and create_by_name like concat('%', #{createByName}, '%') - - - and update_by_name like concat('%', #{updateByName}, '%') - - - and top_organization_id = #{topOrganizationId} - - - and organization_id = #{organizationId} - - - and organization_name like concat('%', #{organizationName}, '%') - - - and settlement_customers_code = #{settlementCustomersCode} - - - and settlement_entity_id = #{settlementEntityId} - - - and settlement_entity = #{settlementEntity} - - - and settlement_method = #{settlementMethod} - - - and settlement_method_code = #{settlementMethodCode} - - - and settlement_direction = #{settlementDirection} - - - and settlement_direction_code = #{settlementDirectionCode} - - - and bank_name like concat('%', #{bankName}, '%') - - - and bank_card_number = #{bankCardNumber} - - - and bank_binding_name like concat('%', #{bankBindingName}, '%') - - + + + and bd.business_flow like concat('%', #{settlementCustomersDO.businessFlow}, '%') + + + and bd.original_business_num like concat('%', #{settlementCustomersDO.originalBusinessNum}, '%') + + + and bd.service_items_name like concat('%', #{settlementCustomersDO.serviceItemsName}, '%') + + + and bd.first_subject_name like concat('%', #{settlementCustomersDO.firstSubjectName}, '%') + + + and bd.second_subject_name like concat('%', #{settlementCustomersDO.secondSubjectName}, '%') + + + and bd.business_state = #{settlementCustomersDO.businessState} + + + and bd.document_type like concat('%', #{settlementCustomersDO.documentType}, '%') + + + and bd.document_type_code = #{settlementCustomersDO.documentTypeCode} + +