diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index b775351..cf772c7 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -1,53 +1,25 @@ package com.glxp.api.controller.purchase; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.pinyin.PinyinUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; -import com.glxp.api.annotation.Log; -import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.BusinessType; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.auth.CustomerInfoEntity; -import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.purchase.CustomerContactEntity; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.purchase.SupCertSetEntity; + import com.glxp.api.entity.purchase.SupCompanyEntity; -import com.glxp.api.exception.JsonException; -import com.glxp.api.req.purchase.FilterCertSetsRequest; -import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.FilterSupCompanyRequest; -import com.glxp.api.req.purchase.SelectCorpBindRequest; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.service.auth.CustomerInfoService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.purchase.CustomerContactService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupCertSetService; import com.glxp.api.service.purchase.SupCompanyService; -import com.glxp.api.util.CustomUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; import java.util.List; -import java.util.ListIterator; @RestController public class SupCompanyController { @@ -59,18 +31,18 @@ public class SupCompanyController { private AuthAdminService authAdminService; @Resource private SupCompanyService companyService; - @Resource - private CustomerContactService customerContactService; - @Resource - private SupCertService supCertService; - @Resource - BasicCorpService basicCorpService; - @Resource - SupCertSetService supCertSetService; - @Resource - SupCompanyService supCompanyService; - @Resource - CustomerInfoService customerInfoService; +// @Resource +// private CustomerContactService customerContactService; +// @Resource +// private SupCertService supCertService; +// @Resource +// BasicCorpService basicCorpService; +// @Resource +// SupCertSetService supCertSetService; +// @Resource +// SupCompanyService supCompanyService; +// @Resource +// CustomerInfoService customerInfoService; // @Resource // AuthRoleAdminService authRoleAdminService; diff --git a/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java b/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java deleted file mode 100644 index 7cee1a4..0000000 --- a/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.glxp.api.service.auth; - - - -import com.glxp.api.entity.auth.CustomerDetailEntity; -import com.glxp.api.entity.auth.CustomerInfoEntity; - -import java.util.List; - -public interface CustomerInfoService { -// -// List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); -// -// List filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest); - - boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity); - - boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); - - boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity); - - boolean deleteById(String id); - - CustomerInfoEntity selectById(String customerId); - - boolean isExitRoleId(String roleId); - - CustomerDetailEntity selectDetail(String customerId); - - /** - * 根据客户ID查询客户信息 - * - * @param customerId - * @return - */ - CustomerInfoEntity findByCustomerId(String customerId); -} diff --git a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java index a71f11f..31e8e2c 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java @@ -10,21 +10,21 @@ import java.util.List; public interface SupCompanyService extends IService { - SupCompanyEntity findCompanyByUnitFk(String unitFk); +// SupCompanyEntity findCompanyByUnitFk(String unitFk); List filterCompany(FilterSupCompanyRequest companyRequest); - SupCompanyEntity findCompany(String CustomerId); - - List getSubCompany(FilterSupCompanyRequest commitRequest); - - List getSubCompany2(FilterSupCompanyRequest commitRequest); - - SupCompanyEntity findCompanyByName(String companyName); - - boolean modifyCompany(SupCompanyEntity companyEntity); - - boolean insertCompany(SupCompanyEntity companyEntity); - - boolean deleteCompany(String customerId); +// SupCompanyEntity findCompany(String CustomerId); +// +// List getSubCompany(FilterSupCompanyRequest commitRequest); +// +// List getSubCompany2(FilterSupCompanyRequest commitRequest); +// +// SupCompanyEntity findCompanyByName(String companyName); +// +// boolean modifyCompany(SupCompanyEntity companyEntity); +// +// boolean insertCompany(SupCompanyEntity companyEntity); +// +// boolean deleteCompany(String customerId); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index d9554d6..471acb0 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -20,16 +20,16 @@ public class SupCompanyServiceImpl extends ServiceImpl companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest); - if (companyEntities != null && companyEntities.size() > 0) { - return companyEntities.get(0); - } - return null; - } +// @Override +// public SupCompanyEntity findCompanyByUnitFk(String unitFk) { +// FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); +// filterSupCompanyRequest.setUnitIdFk(unitFk); +// List companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest); +// if (companyEntities != null && companyEntities.size() > 0) { +// return companyEntities.get(0); +// } +// return null; +// } @Override public List filterCompany(FilterSupCompanyRequest companyRequest) { @@ -43,54 +43,54 @@ public class SupCompanyServiceImpl extends ServiceImpl getSubCompany(FilterSupCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - if (commitRequest.getPage() != null) { - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - } - - List companyEntities = supCompanyDao.getSubCompany(commitRequest); - return companyEntities; - } - - @Override - public List getSubCompany2(FilterSupCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = supCompanyDao.getSubCompany2(commitRequest); - return companyEntities; - } - - @Override - public SupCompanyEntity findCompanyByName(String companyName) { - return supCompanyDao.findCompanyByName(companyName); - } - - @Override - public boolean modifyCompany(SupCompanyEntity companyEntity) { - return supCompanyDao.modifyCompany(companyEntity); - } - - @Override - public boolean insertCompany(SupCompanyEntity companyEntity) { - return supCompanyDao.insertCompany(companyEntity); - } - - - @Override - public boolean deleteCompany(String customerId) { - return supCompanyDao.deleteCompany(customerId); - } +// @Override +// public SupCompanyEntity findCompany(String CustomerId) { +// return supCompanyDao.findCompany(CustomerId); +// } +// +// @Override +// public List getSubCompany(FilterSupCompanyRequest commitRequest) { +// if (commitRequest == null) { +// return Collections.emptyList(); +// } +// if (commitRequest.getPage() != null) { +// int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); +// PageHelper.offsetPage(offset, commitRequest.getLimit()); +// } +// +// List companyEntities = supCompanyDao.getSubCompany(commitRequest); +// return companyEntities; +// } +// +// @Override +// public List getSubCompany2(FilterSupCompanyRequest commitRequest) { +// if (commitRequest == null) { +// return Collections.emptyList(); +// } +// int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); +// PageHelper.offsetPage(offset, commitRequest.getLimit()); +// List companyEntities = supCompanyDao.getSubCompany2(commitRequest); +// return companyEntities; +// } +// +// @Override +// public SupCompanyEntity findCompanyByName(String companyName) { +// return supCompanyDao.findCompanyByName(companyName); +// } +// +// @Override +// public boolean modifyCompany(SupCompanyEntity companyEntity) { +// return supCompanyDao.modifyCompany(companyEntity); +// } +// +// @Override +// public boolean insertCompany(SupCompanyEntity companyEntity) { +// return supCompanyDao.insertCompany(companyEntity); +// } +// +// +// @Override +// public boolean deleteCompany(String customerId) { +// return supCompanyDao.deleteCompany(customerId); +// } }