diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3f9b83f3..00000000 --- a/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildMumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar - -**/mvnw -**/mvnw.cmd -**/.mvn -**/target/ - -.idea -**/.gitignore \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 8256754d..00000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# dqFinancial - -大庆智慧金融平台项目后端代码 \ No newline at end of file diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index 2ffec802..06040f5d 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -1,6 +1,7 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.domain.crms.CustomerEntity; @@ -15,6 +16,8 @@ import java.util.Map; */ public interface CustomerService extends IService { - PageUtils queryPage(Map params); + /*PageUtils queryPage(Map params);*/ + + PageUtils queryList(Integer page, Integer size, CustomerRequest customerRequest); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index c8b8934b..f8012264 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.crms.dao.CustomerDao; import com.daqing.financial.crms.service.CustomerService; import com.daqing.framework.domain.crms.CustomerEntity; +import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.Query; import org.springframework.stereotype.Service; @@ -16,7 +17,7 @@ import java.util.Map; @Service("customerService") public class CustomerServiceImpl extends ServiceImpl implements CustomerService { - @Override + /*@Override public PageUtils queryPage(Map params) { IPage page = this.page( new Query().getPage(params), @@ -24,6 +25,19 @@ public class CustomerServiceImpl extends ServiceImpl