diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java similarity index 98% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java rename to bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java index 6083795..9570f3e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java @@ -1,4 +1,4 @@ -package com.bonus.base.utils; +package com.bonus.common.core.domain; import com.bonus.common.core.constant.HttpStatus; import lombok.Getter; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java index eafed01..1357cb8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java @@ -2,7 +2,7 @@ package com.bonus.base.controller; import com.bonus.base.api.domain.BmAgreement; import com.bonus.base.service.BmAgreementService; -import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java index eaf6ab1..59c3a79 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java @@ -2,7 +2,7 @@ package com.bonus.base.controller; import com.bonus.base.api.domain.BmCustomerType; import com.bonus.base.service.BmCustomerTypeService; -import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java index 750d76e..9cdad5f 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java @@ -2,7 +2,7 @@ package com.bonus.base.controller; import com.bonus.base.api.domain.BmProject; import com.bonus.base.service.BmProjectService; -import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java index ecbbcc2..8e1df42 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java @@ -2,7 +2,7 @@ package com.bonus.base.controller; import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.service.BmSupplierService; -import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java index 11902cf..d61f9bf 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java @@ -1,7 +1,7 @@ package com.bonus.base.service; import com.bonus.base.api.domain.BmSupplier; -import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.domain.ResultBean; import java.util.List; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java index c2cf302..de46df1 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java @@ -3,7 +3,7 @@ package com.bonus.base.service.impl; import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.mapper.BmSupplierMapper; import com.bonus.base.service.BmSupplierService; -import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.domain.ResultBean; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml index d765010..140cb46 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml @@ -53,9 +53,18 @@ from bm_project bmp where is_active = '1' - + and bmp.name LIKE CONCAT('%',#{name},'%') + + and bmp.project_type = #{projectType,jdbcType=INTEGER} + + + and bmp.nature = #{nature,jdbcType=VARCHAR} + + + and bmp.stats = #{stats,jdbcType=VARCHAR} +