diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java index 36265bf..10cbc04 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java @@ -93,4 +93,11 @@ public interface ICoscoCategoryService extends IBaseService { * @return */ String getCategoryNameById(String id); + + + + /** + * 通过品类id集合查询品类名集合 + */ + List getCategoryNameListByIds(List categoryIds); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java index 05fbb57..511153d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java @@ -186,6 +186,21 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl getCategoryNameListByIds(List categoryIds) { + List categoryNameList = new ArrayList<>(); + for (String id : categoryIds) { + BaseResponse info = categoryClient.getInfo(id); + if (info.isSuccess()) { + CoscoCategoryMaintenance data = info.getData(); + categoryNameList.add(data.getCategoryName()); + }else{ + categoryNameList.add(coscoCategoryMapper.selectCategoryNameById(id)); + } + } + return categoryNameList; + } + private List buildTree(List categories) { // 获取所有顶级节点 (parentId = "0") List rootNodes = categories.stream() diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java index 2b9fd2e..5189c34 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java @@ -20,7 +20,6 @@ import java.util.*; /** - * 中远海运_供应商_银行账户Controller * * @author ruoyi * @date 2025-06-16 @@ -32,7 +31,7 @@ public class CoscoAccessSupplierController extends BaseController { private ICoscoAccessSupplierService coscoAccessSupplierService; /** - * 分组查询工作任务下的评审项 + * 供应商准入情况统计查询 */ @ApiOperation("查询分页数据") @PostMapping("/getPage") @@ -43,6 +42,11 @@ public class CoscoAccessSupplierController extends BaseController { return BaseResponse.success(coscoAccessSupplierService.selectCoscoAccessSupplierAndWorkPageList(coscoAccessSupplier)); } + /** + * 供应商准入情况统计导出 + * @param response + * @param coscoAccessSupplier + */ @GetMapping("/getPageExport") public void getPageExport(HttpServletResponse response, CoscoAccessSupplier coscoAccessSupplier){ try{ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java index 189d83c..6452bbd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java @@ -183,7 +183,6 @@ public class CoscoSupplierBaseController extends BaseController { coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); List list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase); - // 动态设置导出字段(忽略未标注字段) Set includeFields = new HashSet<>(Arrays.asList( "name","supplierTypeCn", "enterpriseTypeCn","categoryName","updateTime","accessStatusCn" // 指定要导出的字段名 )); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java index 9a900ec..67f18e4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java @@ -64,8 +64,6 @@ public interface CoscoAccessSupplierCategoryMapper { public Integer selectBySupplierIdAndCategoryId(CoscoAccessSupplierCategory coscoAccessSupplierCategory); - public List selectCategoryNameList(CoscoAccessSupplierCategory coscoAccessSupplierCategory); - /** * 新增供应商准入_供应商已准入品类 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java index 541bd04..2562a72 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java @@ -75,6 +75,9 @@ public class CoscoAccessSupplier extends CoscoBaseEntity { private List deptIdList; + //品类id + private List categoryIdList; + //品类名称 @ExcelProperty(value = "准入品类", converter = ListToStringConverter.class) private List categoryNameList; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java index e190a13..1f29eb2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java @@ -100,6 +100,10 @@ public class CoscoAccessWork extends CoscoBaseEntity { //品类名集合 private List categoryNameList; + //品类id集合 + private List categoryIdList; + + //单位名称 private String orgName; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java index ee8e692..1375a2d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserItemMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserMapper; @@ -33,7 +34,8 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi private CoscoAccessUserItemMapper coscoAccessUserItemMapper; @Autowired private CoscoAccessUserMapper coscoAccessUserMapper; - + @Autowired + private ICoscoCategoryService coscoCategoryService; /** * 查询供应商准入_关联供应商 @@ -49,12 +51,20 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi @Override public IPage selectCoscoAccessSupplierAndWorkPageList(CoscoAccessSupplier coscoAccessSupplier) { IPage accessSupplierIPage = new Page<>(coscoAccessSupplier.getPageNo(), coscoAccessSupplier.getPageSize()); - return coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkPageList(accessSupplierIPage,coscoAccessSupplier); + IPage pageData = coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkPageList(accessSupplierIPage,coscoAccessSupplier); + for(CoscoAccessSupplier accessSupplier : pageData.getRecords()){ + accessSupplier.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(accessSupplier.getCategoryIdList())); + } + return pageData; } @Override public List selectCoscoAccessSupplierAndWorkExecList(CoscoAccessSupplier coscoAccessSupplier) { - return coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkExecList(coscoAccessSupplier); + List coscoAccessSupplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkExecList(coscoAccessSupplier); + for(CoscoAccessSupplier accessSupplier : coscoAccessSupplierList){ + accessSupplier.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(accessSupplier.getCategoryIdList())); + } + return coscoAccessSupplierList; } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index db88c3b..7634865 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -67,7 +67,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg IPage page = new Page<>(data.getPageNo(), data.getPageSize()); data.setApplyType(CoscoType.APPLY_TYPE_PLZR); IPage pageData = coscoAccessWorkMapper.selectPageList(page, data); - //TODO 暂时先这么写,后续如果准入主表添加,单位id与部门id,就通过2个id查询对应的名称,然后set进去 for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setOrgName(orgDeptVo.getOrgName()); @@ -139,7 +138,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg //准入基础信息 CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id); - //TODO 获取准入任务的部门id ,通过部门id查询部门名称,等完善单位数据后 ,再确认一下 OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setDeptName(orgDeptVo.getDeptName()); vo.setCoscoAccessWork(coscoAccessWork); @@ -255,6 +253,9 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplierCategory.setUpdateTime(date); coscoAccessSupplierCategory.setLastUpdateTime(date); coscoAccessSupplierCategoryList.add(coscoAccessSupplierCategory); + + //消息用 + accessCategory.setCategoryName(coscoCategoryService.getCategoryNameById(accessCategory.getCategoryId())); supplierAndCateGoryList.add(accessCategory); } if (!CollectionUtils.isEmpty(coscoAccessSupplierCategoryList)) { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java index 471e55b..7479946 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java @@ -80,7 +80,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //只查询供应商准入 data.setApplyType(CoscoType.APPLY_TYPE_GYSZR); IPage pageData = coscoAccessWorkMapper.selectPageList(page, data); - //TODO 暂时先这么写,后续如果准入主表添加,单位id与部门id,就通过2个id查询对应的名称,然后set进去 for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setOrgName(orgDeptVo.getOrgName()); @@ -95,11 +94,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //只查询供应商准入 data.setApplyType(CoscoType.APPLY_TYPE_GYSZR); IPage pageData = coscoAccessWorkMapper.selectCoscoAccessWorkUserReviewPage(page, data); - //TODO 暂时先这么写,后续如果准入主表添加,单位id与部门id,就通过2个id查询对应的名称,然后set进去 for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setOrgName(orgDeptVo.getOrgName()); coscoAccessWork.setDeptName(orgDeptVo.getDeptName()); + coscoAccessWork.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(coscoAccessWork.getCategoryIdList())); } return pageData; } @@ -110,11 +109,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { IPage page = new Page<>(data.getPageNo(), data.getPageSize()); data.setApplyType(CoscoType.APPLY_TYPE_GYSZR); IPage pageData = coscoAccessWorkMapper.selectPageList(page, data); - //TODO 暂时先这么写,后续如果准入主表添加,单位id与部门id,就通过2个id查询对应的名称,然后set进去 for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setOrgName(orgDeptVo.getOrgName()); coscoAccessWork.setDeptName(orgDeptVo.getDeptName()); + coscoAccessWork.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(coscoAccessWork.getCategoryIdList())); } return pageData; } @@ -131,7 +130,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //准入基础信息 CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id); - //TODO 获取准入任务的部门id ,通过部门id查询部门名称,等完善单位数据后 ,再确认一下 OrgDeptVo dept = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setDeptName(dept.getOrgName());//准入部门 vo.setCoscoAccessWork(coscoAccessWork); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index f29be3f..3e74fdd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -17,6 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryContainMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*; @@ -90,6 +91,8 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); - return coscoSupplierBaseMapper.getMySupplierBasePage(page, coscoSupplierBase); + IPage pageData = coscoSupplierBaseMapper.getMySupplierBasePage(page, coscoSupplierBase); + for (CoscoSupplierBase supplierBase : pageData.getRecords()){ + String[] categoryIds = supplierBase.getCategoryId().split(","); + List categoryIdList = Arrays.asList(categoryIds); + List categoryNameList = coscoCategoryService.getCategoryNameListByIds(categoryIdList); + supplierBase.setCategoryName(String.join(",", categoryNameList)); + } + return pageData; } /** @@ -173,13 +183,23 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase) { - return coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase); + + List coscoSupplierBaseList = coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase); + for (CoscoSupplierBase supplierBase : coscoSupplierBaseList){ + //TODO enterpriseType 转中文 + String[] categoryIds = supplierBase.getCategoryId().split(","); + List categoryIdList = Arrays.asList(categoryIds); + List categoryNameList = coscoCategoryService.getCategoryNameListByIds(categoryIdList); + supplierBase.setCategoryName(String.join(",", categoryNameList)); + } + return coscoSupplierBaseList; } @Override @@ -189,6 +209,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getPage(CoscoSupplierUser coscoSupplierUser) { IPage page = new Page<>(coscoSupplierUser.getPageNo(), coscoSupplierUser.getPageSize()); - return coscoSupplierUserMapper.selectCoscoSupplierUserPage(page,coscoSupplierUser); + IPage pageData = coscoSupplierUserMapper.selectCoscoSupplierUserPage(page,coscoSupplierUser); + for(CoscoSupplierUser user : pageData.getRecords()){ + List coscoSupplierUserCategoryList = user.getCoscoSupplierUserCategoryList(); + for(CoscoSupplierUserCategory coscoSupplierUserCategory : coscoSupplierUserCategoryList){ + coscoSupplierUserCategory.setCategoryName(coscoCategoryService.getCategoryNameById(coscoSupplierUserCategory.getCategoryId())); + + } + } + return pageData; } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java index 255f143..dcb021a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java @@ -9,6 +9,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; @@ -52,6 +53,9 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { @Autowired private IOrgService orgService; + @Autowired + private ICoscoCategoryService coscoCategoryService; + @Override public IPage getPage(CoscoSupplierexit data) { IPage page = new Page<>(data.getPageNo(), data.getPageSize()); @@ -77,6 +81,8 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { for(CoscoAccessSupplierCategory category : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId()); category.setDeptName(orgDeptVo.getDeptName()); + category.setCategoryName(coscoCategoryService.getCategoryNameById(category.getCategoryId())); + } return pageData; } @@ -90,6 +96,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId()); category.setOrgName(orgDeptVo.getOrgName()); category.setDeptName(orgDeptVo.getDeptName()); + category.setCategoryName(coscoCategoryService.getCategoryNameById(category.getCategoryId())); } return pageData; } @@ -104,7 +111,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { public CoscoSupplierexitVo selectCoscoSupplierexitById(String id) { CoscoSupplierexitVo vo = new CoscoSupplierexitVo(); CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(id); - //TODO 获取准入任务的部门id ,通过部门id查询部门名称,等完善单位数据后 ,再确认一下 OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoSupplierexit.getDeptId()); coscoSupplierexit.setDeptName(orgDeptVo.getDeptName()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java deleted file mode 100644 index 52dd81e..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.controller; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo; -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; -import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 项目字典Controller - * - * @author ruoyi - * @date 2025-06-23 - */ -@RestController -@RequestMapping("/cosco/dictProject") -public class DictProjectController extends BaseController { - @Autowired - private IDictProjectService dictProjectService; - - /** - * 顶级列表查询 - * @param dictProject - * @return - */ - @PostMapping("/getTopLevelList") - public BaseResponse> getTopLevelList(@RequestBody DictProject dictProject){ - dictProject.setParentCode("/"); - return BaseResponse.success(dictProjectService.getPage(dictProject)); - } - - /** - * 二级列表查询 - * @param dictProject - * @return - */ - @PostMapping("/getSecondaryList") - public BaseResponse> getSecondaryList(@RequestBody DictProject dictProject){ - return BaseResponse.success(dictProjectService.getPage(dictProject)); - } - - - /** - * 获取所有列表 - * @param parentCode - * @return - */ - @GetMapping("/getAllList/{parentCode}") - public BaseResponse getAllList(@PathVariable String parentCode) { - DictProject dictProject = new DictProject(); - dictProject.setParentCode(parentCode); - List list = dictProjectService.selectDictProjectList(dictProject); - return BaseResponse.success(list); - } - - - - /** - * 获取项目字典详细信息 - */ - @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") Long id) { - return BaseResponse.success(dictProjectService.selectDictProjectById(id)); - } - - /** - * 新增项目字典 - */ - @PostMapping - public BaseResponse add(@RequestBody DictProject dictProject) { - return BaseResponse.success(dictProjectService.insertDictProject(dictProject)); - } - - /** - * 修改项目字典 - */ - @PutMapping - public BaseResponse edit(@RequestBody DictProject dictProject) { - return BaseResponse.success(dictProjectService.updateDictProject(dictProject)); - } - - /** - * 删除项目字典 - */ - @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable Long[] ids) { - return BaseResponse.success(dictProjectService.deleteDictProjectByIds(ids)); - } -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictRegionController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictRegionController.java deleted file mode 100644 index 42efecb..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictRegionController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.controller; - - -import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictRegion; -import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictRegionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * 项目字典Controller - * - * @author ruoyi - * @date 2025-06-23 - */ -@RestController -@RequestMapping("/cosco/dictRegion") -public class DictRegionController extends BaseController { - @Autowired - private IDictRegionService regionService; - - /** - * 获取所有省级行政区划列表 - * @apiNote 获取中国所有省级行政区划(省份、直辖市、自治区等) - * @return 省级行政区划列表 - * @example GET /api/regions/provinces - */ - @GetMapping("/region") - public BaseResponse> listRegion() { - return BaseResponse.success(regionService.getProvinces()); - } - - /** - * 获取指定地区的所有下级行政区划 - * @apiNote 递归获取某个地区的所有下级地区(包括子级、孙级等) - * @param cityId 地区ID - * @return 下级行政区划列表 - * @example GET /api/regions/110000/children - */ - @GetMapping("/children/{cityId}") - public List listChildren(@PathVariable Long cityId) { - return regionService.getDistrictsByCity(cityId); - } - - - /** - * 获取指定地区的完整行政区划路径 - * @apiNote 获取从省级到当前地区的完整路径 - * @param regionId 地区ID - * @return 完整路径字符串,各级之间用"/"分隔 - * @example GET /api/regions/110108/path - * @response 北京市/市辖区/海淀区 - */ - @GetMapping("/path/{regionId}") - public String getPath(@PathVariable Integer regionId) { - return regionService.getFullPath(regionId); - } - - /** - * 获取所有省级行政区划列表 - * @apiNote 获取中国所有省级行政区划(省份、直辖市、自治区等) - * @return 省级行政区划列表 - * @example GET /api/regions/provinces - */ - @GetMapping("/regionInternational") - public BaseResponse> listRegionInternational() { - return BaseResponse.success(regionService.listRegionInternational()); - } - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java deleted file mode 100644 index 7c20697..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.dao; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; -import org.springframework.data.repository.query.Param; - -import java.util.List; - -/** - * 项目字典Mapper接口 - * - * @author ruoyi - * @date 2025-06-23 - */ -public interface DictProjectMapper { - /** - * 查询项目字典 - * - * @param id 项目字典主键 - * @return 项目字典 - */ - public DictProject selectDictProjectById(Long id); - - /** - * 查询项目字典列表 - * - * @param dictProject 项目字典 - * @return 项目字典集合 - */ - public List selectDictProjectList(DictProject dictProject); - - /** - * 新增项目字典 - * - * @param dictProject 项目字典 - * @return 结果 - */ - public int insertDictProject(DictProject dictProject); - - /** - * 修改项目字典 - * - * @param dictProject 项目字典 - * @return 结果 - */ - public int updateDictProject(DictProject dictProject); - - /** - * 删除项目字典 - * - * @param id 项目字典主键 - * @return 结果 - */ - public int deleteDictProjectById(Long id); - - /** - * 批量删除项目字典 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteDictProjectByIds(Long[] ids); - - /** - * 列表信息 - * @param p - * @param vo - * @return - */ - IPage selectPage(IPage p,@Param("vo") DictProject vo); -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictRegionMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictRegionMapper.java deleted file mode 100644 index aa82636..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictRegionMapper.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.dao; - - -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictRegion; - -import java.util.List; - -/** - * 地市 - */ -public interface DictRegionMapper { - - /** - * 根据ID查询地市信息 - */ - DictRegion selectById(Integer id); - - /** - * 根据父ID查询子地市列表 - */ - List selectByParentId(Long parentId); - - /** - * 根据级别查询地市列表 - */ - List selectByList(); - - - /** - * 根据级别查询全球地市列表 - */ - List selectInternationalLevel(Integer level); - - /** - * 根据名称模糊查询地市列表 - */ - List searchByName(String name); - - /** - * 查询所有地市信息 - */ - List selectAll(); - - List selectAllChildren(Long id); - - List selectAllParents(Long id); - - - - - - - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml deleted file mode 100644 index b2069ad..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, - code, - dic_name, - parent_code, - parent_type, - default_flag, - use_flag, - order_flag, - description, - dict_type_code, - dict_type_name - from dict_project - - - - - - - - - - insert into dict_project - - code, - dic_name, - parent_code, - parent_type, - default_flag, - use_flag, - order_flag, - description, - dict_type_code, - dict_type_name, - - - #{code}, - #{dicName}, - #{parentCode}, - #{parentType}, - #{defaultFlag}, - #{useFlag}, - #{orderFlag}, - #{description}, - #{dictTypeCode}, - #{dictTypeName}, - - - - insert into dict_project - ( id, code, dic_name, parent_code, parent_type, default_flag, use_flag, order_flag, description, dict_type_code, - dict_type_name) - values - - ( #{item.id}, #{item.code}, #{item.dicName}, #{item.parentCode}, #{item.parentType}, #{item.defaultFlag}, - #{item.useFlag}, #{item.orderFlag}, #{item.description}, #{item.dictTypeCode}, #{item.dictTypeName}) - - - - update dict_project - - code = - #{code}, - - dic_name = - #{dicName}, - - parent_code = - #{parentCode}, - - parent_type = - #{parentType}, - - default_flag = - #{defaultFlag}, - - use_flag = - #{useFlag}, - - order_flag = - #{orderFlag}, - - description = - #{description}, - - dict_type_code = - #{dictTypeCode}, - - dict_type_name = - #{dictTypeName}, - - - where id = #{id} - - - - update dict_project - set del_flag = 2 - where id = #{id} - - - - update dict_project set del_flag = 2 where id in - - #{id} - - - diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictRegionMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictRegionMapper.xml deleted file mode 100644 index 056117c..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictRegionMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - id, p_id, name, level, ab - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java deleted file mode 100644 index 92b20fe..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.entity; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; -import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目字典对象 dict_project - * - * @author ruoyi - * @date 2025-06-23 - */ -@Data -public class DictProject extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 编号 */ - private Long id; - - /** 字典code */ - private String code; - - /** 字典名称 */ - private String dicName; - - /** 父类code */ - private String parentCode; - - /** 父类类型 */ - private String parentType; - - /** 是否默认 */ - private String defaultFlag; - - /** 是否应用 */ - private String useFlag; - - /** 排序 */ - private Long orderFlag; - - /** 描述 */ - private String description; - - /** 分组编码 */ - private String dictTypeCode; - - /** 分组名称 */ - private String dictTypeName; - - @ApiModelProperty(value = "分页对象信息") - private BasePageRequest basePageRequest; -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictRegion.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictRegion.java deleted file mode 100644 index f588756..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictRegion.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.entity; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class DictRegion { - - private Integer id; // 地区ID - private Integer parentId; // 父地区ID - private String name; // 地区名称 - private Integer level; // 地区级别(0-省,1-市,2-区县) - private String abbr; // 地区缩写(如BJ) - - private String enName; - - private List children; - - public DictRegion() { - this.children = new ArrayList<>(); - } - - // 修改addChild方法,增加空检查 - public void addChild(DictRegion child) { - if (child != null) { - if (this.children == null) { - this.children = new ArrayList<>(); - } - this.children.add(child); - } - } - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java deleted file mode 100644 index 298552a..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; - -import java.util.List; - -/** - * 项目字典Service接口 - * - * @author ruoyi - * @date 2025-06-23 - */ -public interface IDictProjectService { - /** - * 查询项目字典 - * - * @param id 项目字典主键 - * @return 项目字典 - */ - public DictProject selectDictProjectById(Long id); - - /** - * 查询项目字典列表 - * - * @param dictProject 项目字典 - * @return 项目字典集合 - */ - public List selectDictProjectList(DictProject dictProject); - - /** - * 新增项目字典 - * - * @param dictProject 项目字典 - * @return 结果 - */ - public int insertDictProject(DictProject dictProject); - - /** - * 修改项目字典 - * - * @param dictProject 项目字典 - * @return 结果 - */ - public int updateDictProject(DictProject dictProject); - - /** - * 批量删除项目字典 - * - * @param ids 需要删除的项目字典主键集合 - * @return 结果 - */ - public int deleteDictProjectByIds(Long[] ids); - - /** - * 删除项目字典信息 - * - * @param id 项目字典主键 - * @return 结果 - */ - public int deleteDictProjectById(Long id); - - /** - * 顶级列表 - * @param dictProject - * @return - */ - IPage getPage(DictProject dictProject); -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictRegionService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictRegionService.java deleted file mode 100644 index 95fb3d8..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictRegionService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.service; - -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictRegion; - -import java.util.List; - -/** - * 地市 - */ -public interface IDictRegionService { - - - /** - * 获取省份列表 - * @return 所有省份列表 - */ - List getProvinces(); - - /** - * 获取全球省份列表 - * @return 所有省份列表 - */ - List listRegionInternational(); - - - /** - * 获取指定城市下的区县列表 - * @param cityId 城市ID - * @return 区县列表 - */ - List getDistrictsByCity(Long cityId); - - /** - * 获取完整行政区划路径 - * @param regionId 区县ID - * @return 完整路径(如"北京市/市辖区/海淀区") - */ - String getFullPath(Integer regionId); - - - /** - * 递归获取指定地区的所有下级地区(包括子级、孙级等所有后代) - * @param regionId 地区ID - * @return 所有下级地区列表 - */ - List getAllChildrenRegions(Long regionId); - - - - /** - * 递归获取指定地区的所有上级地区(包括父级、祖父级等所有祖先) - * @param regionId 地区ID - * @return 所有上级地区列表 - */ - List getAllParentRegions(Long regionId); - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java deleted file mode 100644 index 843cac9..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.service.impl; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo; -import com.chinaunicom.zyhy.ebtp.supplier.dict.dao.DictProjectMapper; -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; -import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目字典Service业务层处理 - * - * @author ruoyi - * @date 2025-06-23 - */ -@Service -public class DictProjectServiceImpl implements IDictProjectService { - @Autowired - private DictProjectMapper dictProjectMapper; - - /** - * 查询项目字典 - * - * @param id 项目字典主键 - * @return 项目字典 - */ - @Override - public DictProject selectDictProjectById(Long id) { - return dictProjectMapper.selectDictProjectById(id); - } - - /** - * 查询项目字典列表 - * - * @param dictProject 项目字典 - * @return 项目字典 - */ - @Override - public List selectDictProjectList(DictProject dictProject) { - return dictProjectMapper.selectDictProjectList(dictProject); - } - - /** - * 新增项目字典 - * - * @param dictProject 项目字典 - * @return 结果 - */ - @Override - public int insertDictProject(DictProject dictProject) { - return dictProjectMapper.insertDictProject(dictProject); - } - - /** - * 修改项目字典 - * - * @param dictProject 项目字典 - * @return 结果 - */ - @Override - public int updateDictProject(DictProject dictProject) { - return dictProjectMapper.updateDictProject(dictProject); - } - - /** - * 批量删除项目字典 - * - * @param ids 需要删除的项目字典主键 - * @return 结果 - */ - @Override - public int deleteDictProjectByIds(Long[] ids) { - return dictProjectMapper.deleteDictProjectByIds(ids); - } - - /** - * 删除项目字典信息 - * - * @param id 项目字典主键 - * @return 结果 - */ - @Override - public int deleteDictProjectById(Long id) { - return dictProjectMapper.deleteDictProjectById(id); - } - - @Override - public IPage getPage(DictProject dictProject) { - IPage p = new Page<>(dictProject.getBasePageRequest().getPageNo(), - dictProject.getBasePageRequest().getPageSize()); - return dictProjectMapper.selectPage(p, dictProject); - } -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictRegionServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictRegionServiceImpl.java deleted file mode 100644 index ca51666..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictRegionServiceImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.dict.service.impl; - - -import com.chinaunicom.zyhy.ebtp.supplier.dict.dao.DictRegionMapper; -import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictRegion; -import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictRegionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; - - -@Service -public class DictRegionServiceImpl implements IDictRegionService { - - @Autowired - private DictRegionMapper regionMapper; - - - /** - * 获取所有省级行政区划列表 - * @return 省级行政区划列表(level=0的地区) - */ - @Override - public List getProvinces() { - List dictRegions = regionMapper.selectByList(); - return buildTree(dictRegions); - } - - - /** - * 将平面列表转换为树形结构 - * @param regions 平面地区列表 - * @return 树形结构的地区列表(只包含顶级节点) - */ - public List buildTree(List regions) { - // 创建ID到地区的映射 - Map regionMap = new HashMap<>(); - for (DictRegion region : regions) { - if (region != null) { - regionMap.put(region.getId(), region); - } - } - - // 构建树形结构 - List result = new ArrayList<>(); - for (DictRegion region : regions) { - if (region == null) continue; - - Integer parentId = region.getParentId(); - if (parentId == null || parentId == 0) { - // 顶级节点(省份) - result.add(region); - } else { - // 子节点,添加到父节点的children中 - DictRegion parent = regionMap.get(parentId); - if (parent != null) { - parent.addChild(region); - } else { - // 可以记录日志或处理孤儿节点 - } - } - } - - return result; - } - - @Override - public List listRegionInternational() { - return regionMapper.selectInternationalLevel(0); - } - - - /** - * 根据城市ID获取该城市下的所有区县列表 - * @param cityId 城市ID - * @return 区县列表(指定城市下的子地区) - */ - @Override - public List getDistrictsByCity(Long cityId) { - return regionMapper.selectByParentId(cityId); - } - - /** - * 获取指定地区的完整行政区划路径 - * 例如:对于"海淀区",返回"北京市/市辖区/海淀区" - * @param regionId 地区ID - * @return 完整路径字符串,各级之间用"/"分隔 - */ - @Override - public String getFullPath(Integer regionId) { - DictRegion region = regionMapper.selectById(regionId); - if (region == null) { - return null; - } - - StringBuilder path = new StringBuilder(region.getName()); - Integer parentId = region.getParentId(); - - while (parentId != null && parentId != 0) { - DictRegion parent = regionMapper.selectById(parentId); - if (parent != null) { - path.insert(0, parent.getName() + "/"); - parentId = parent.getParentId(); - } else { - break; - } - } - - return path.toString(); - } - - - /** - * 递归获取指定地区的所有下级地区(包括子级、孙级等所有后代) - * @param regionId 地区ID - * @return 所有下级地区列表 - */ - @Override - public List getAllChildrenRegions(Long regionId) { - return regionMapper.selectAllChildren(regionId); - } - - /** - * 递归获取指定地区的所有上级地区(包括父级、祖父级等所有祖先) - * @param regionId 地区ID - * @return 所有上级地区列表 - */ - @Override - public List getAllParentRegions(Long regionId) { - return regionMapper.selectAllParents(regionId); - } - - -} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml index 1185ae2..c0525ff 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml @@ -10,8 +10,7 @@ - select a.category_name as categoryName,c.access_work_id, c.category_id from cosco_access_category c - left join cosco_category a on c.category_id = a.id + select c.access_work_id, c.category_id from cosco_access_category c - diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml index f02a142..4b41167 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml @@ -14,7 +14,7 @@ - @@ -90,8 +90,7 @@ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml index c68d2ec..4fe5b14 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml @@ -23,7 +23,7 @@ - @@ -123,8 +123,7 @@ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml index eb6176c..b2985fd 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml @@ -34,13 +34,9 @@ csb.account_name, csb.account, csb.currency, - dpbz.dic_name as currencyName, csb.nation, - COALESCE(drn.`name`, dri.`name`) as nationName, csb.province, - drp.`name` as provinceName, csb.city, - drc.`name` as cityName, csb.del_flag, csb.create_by, csb.create_time, @@ -49,11 +45,6 @@ csb.last_update_time FROM cosco_supplier_bank csb - left join dict_project dpbz on csb.currency = dpbz.`code` and dpbz.parent_code = 'currency' - left join dict_region drn on csb.nation = drn.id - left join dict_region drp on csb.province = drp.id - left join dict_region drc on csb.city = drc.id - left join dict_region_international dri on csb.nation = dri.id diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index 83208f2..13ff2b7 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -76,7 +76,6 @@ csb.licence_accessory, csb.licence_date, csb.enterprise_type, - dp.dic_name as enterprise_type_cn, csb.name, csb.name_en, csb.social_credit_code, @@ -90,15 +89,12 @@ csb.contacts_name, csb.contacts_phone, csb.contacts_type, - dpc.dic_name as contactsTypeName, csb.contacts_email, csb.telephone, csb.nation, - dri.`name` as nationName, csb.vat, csb.taxpayer_id, csb.currency, - dpbz.dic_name as currency_cn, csb.person_name, csb.person_phone, csb.person_bank, @@ -137,16 +133,12 @@ csb.last_update_time FROM cosco_supplier_base csb - left join dict_project dp on csb.enterprise_type = dp.`code` and dp.parent_code = 'enterprise_type' - left join dict_project dpbz on csb.currency = dpbz.`code` and dpbz.parent_code = 'currency' - left join dict_project dpc on csb.contacts_type = dpc.`code` and dpc.parent_code = 'contacts_type' - left join dict_region_international dri on csb.nation = dri.id SELECT - c.categoryName, + c.categoryId, CASE supplier_type WHEN 'dvs' THEN '境内企业' WHEN 'ovs' THEN '境外企业' @@ -159,7 +151,6 @@ ELSE NULL END AS unified_code, csb.enterprise_type, - dp.dic_name as enterprise_type_cn, csb.id, cas.access_work_id, cas.supplier_id, @@ -179,12 +170,10 @@ left join ( SELECT cac.access_work_id, - GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName + GROUP_CONCAT(cac.category_id SEPARATOR ', ') AS categoryId FROM cosco_access_category cac - INNER JOIN cosco_category cc ON cac.category_id = cc.id and cc.del_flag = 'normal' GROUP BY cac.access_work_id ) as c on c.access_work_id = caw.id - left join dict_project dp on csb.enterprise_type = dp.`code` and dp.parent_code = 'enterprise_type' @@ -203,7 +192,6 @@ END AS unified_code, csb.supplier_type, csb.enterprise_type, - dp.dic_name as enterprise_type_cn, csb.id, cas.access_work_id, cas.supplier_id, @@ -233,7 +221,6 @@ cosco_access_supplier cas LEFT JOIN cosco_access_work caw ON cas.access_work_id = caw.id and caw.del_flag = 'normal' LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id and csb.del_flag = 'normal' - left join dict_project dp on csb.enterprise_type = dp.`code` and dp.parent_code = 'enterprise_type' diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml index 2cea8d8..51a1aeb 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml @@ -125,7 +125,6 @@ ELSE sb.`name` END AS supplierName, sb.enterprise_type, - dp.dic_name as enterprise_type_cn, c.change_by, c.change_time, c.approve_status, @@ -145,7 +144,6 @@ FROM cosco_supplier_change_apply c LEFT JOIN cosco_supplier_base sb ON c.supplier_id = sb.id - left join dict_project dp on sb.enterprise_type = dp.`code` and dp.parent_code = 'enterprise_type' left join ( SELECT cas.supplier_id, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml index d3b9e03..41a1afe 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml @@ -29,7 +29,6 @@ csi.id, supplier_id, taxpayer_type, - dp.dic_name as taxpayer_type_cn, taxpayer_code, phone, account, @@ -45,7 +44,6 @@ last_update_time FROM cosco_supplier_invoice csi - left join dict_project dp on csi.taxpayer_type = dp.`code` and dp.parent_code = 'taxpayer_type' diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserMapper.xml index 4d58da2..a49a801 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserMapper.xml @@ -56,11 +56,9 @@ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml index c3912cb..7c62e99 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml @@ -21,7 +21,6 @@ CASE WHEN s.supplier_type = 'ovs' THEN name_en ELSE name END AS supplierName, - ca.category_name as categoryName, sc.supplierexit_id, sc.supplier_id, sc.category_id @@ -29,7 +28,6 @@ cosco_supplierexit_supplier_category sc left join cosco_supplierexit e on sc.supplierexit_id = e.id left join cosco_supplier_base s on sc.supplier_id = s.id and s.del_flag = 'normal' - left join cosco_category ca on sc.category_id = ca.id and ca.del_flag = 'normal'