diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaHouse.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaHouse.java index f9b0c8e..f86494a 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaHouse.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaHouse.java @@ -1,5 +1,6 @@ package com.bonus.base.api.domain; +import com.bonus.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,7 +16,7 @@ import java.io.Serializable; @Data @AllArgsConstructor @NoArgsConstructor -public class MaHouse implements Serializable { +public class MaHouse extends BaseEntity implements Serializable { private static final long serialVersionUID = -11758888261312379L; private Integer id; diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/BaseEntity.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/BaseEntity.java index 680b3c2..a2992ba 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/BaseEntity.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/BaseEntity.java @@ -8,6 +8,7 @@ import lombok.Setter; import java.io.Serializable; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -47,10 +48,23 @@ public class BaseEntity implements Serializable private String keyWord; + /** + * 导出所选数据 + */ + private List dataCondition; + /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; + public List getDataCondition() { + return dataCondition; + } + + public void setDataCondition(List dataCondition) { + this.dataCondition = dataCondition; + } + public String getSearchValue() { return searchValue; } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml index c5cdba8..5f663b0 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmAgreementMapper.xml @@ -67,6 +67,12 @@ OR ba.authorizing_phone LIKE CONCAT('%',#{keyWord},'%') ) + + AND ba.id in + + #{proId} + + order by ba.sign_date desc diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerMapper.xml index 245cd3d..b9bd375 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerMapper.xml @@ -33,6 +33,12 @@ AND name like concat('%', #{name}, '%') + + AND id in + + #{proId} + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerTypeMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerTypeMapper.xml index 6befcea..9e8a651 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerTypeMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmCustomerTypeMapper.xml @@ -96,6 +96,12 @@ and `NAME` like concat('%',#{name},'%') + + AND ID in + + #{proId} + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmProjectMapper.xml index 637fd85..e2c2c2a 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmProjectMapper.xml @@ -74,6 +74,12 @@ and bmp.stats = #{stats,jdbcType=VARCHAR} + + AND bmp.id in + + #{proId} + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmSupplierMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmSupplierMapper.xml index f109fbe..b28d5ae 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/BmSupplierMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/BmSupplierMapper.xml @@ -47,6 +47,12 @@ OR pic_url LIKE CONCAT('%',#{keyWord},'%') ) + + AND id in + + #{proId} + + ORDER BY id DESC - insert into bm_supplier( + insert into bm_supplier name, address, @@ -66,7 +72,7 @@ scope_business, notes, pic_url, - is_active, + is_active, company_id values @@ -79,7 +85,7 @@ #{scopeBusiness}, #{notes}, #{picUrl}, - "1", + 1, #{companyId} diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/material/MaHouseMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/material/MaHouseMapper.xml index 0307b58..8b416fe 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/material/MaHouseMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/material/MaHouseMapper.xml @@ -26,6 +26,12 @@ and name like concat('%',#{name},'%') + + AND id in + + #{proId} + +