liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除dict_project

Browse Source
This commit is contained in:
YY
2025-07-23 11:39:41 +08:00
parent 24c87756c9
commit ca201ee4f7
4 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.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.mall.ebtp.common.base.entity.CoscoCategoryMaintenanceVO;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
@ -44,16 +45,16 @@ public class CoscoCategoryController extends BaseController {
* 品类列表查询
*/
@GetMapping(value = "/categoryTree")
public BaseResponse<List<CoscoCategoryVO>> categoryTree(CoscoCategory coscoCategory) {
return BaseResponse.success(coscoCategoryService.selectCategoryTree(coscoCategory));
public BaseResponse<List<CoscoCategoryMaintenanceVO>> categoryTree(CoscoCategoryMaintenanceVO coscoCategory) {
return coscoCategoryService.selectCategoryTree(coscoCategory);
}
/**
* 品类查询去除上级锁定列表
*/
@GetMapping(value = "/categoryTreeNoSuperior")
public BaseResponse<List<CoscoCategoryVO>> categoryTreeNoSuperior(CoscoCategory coscoCategory) {
return BaseResponse.success(coscoCategoryService.selectCategoryTreeNoSuperior(coscoCategory));
public BaseResponse<List<CoscoCategoryMaintenanceVO>> categoryTreeNoSuperior(CoscoCategoryMaintenanceVO coscoCategory) {
return coscoCategoryService.selectCategoryTreeNoSuperior(coscoCategory);
}
@ -96,4 +97,9 @@ public class CoscoCategoryController extends BaseController {
public BaseResponse<Integer> remove(@PathVariable String id) {
return BaseResponse.success(coscoCategoryService.deleteCoscoCategoryById(id));
}
@GetMapping(value = "/getCategoryNameById")
public String getCategoryNameById(String id){
return coscoCategoryService.getCategoryNameById(id);
}
}

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java
View File

@ -1,6 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenanceVO;
import com.chinaunicom.mall.ebtp.common.base.service.IBaseService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
@ -75,14 +77,14 @@ public interface ICoscoCategoryService extends IBaseService<CoscoCategory> {
* @param coscoCategory
* @return
*/
List<CoscoCategoryVO> selectCategoryTree(CoscoCategory coscoCategory);
BaseResponse<List<CoscoCategoryMaintenanceVO>> selectCategoryTree(CoscoCategoryMaintenanceVO coscoCategory);
/**
* 查询品类树(无上级品类)
* @param coscoCategory
* @return
*/
List<CoscoCategoryVO> selectCategoryTreeNoSuperior(CoscoCategory coscoCategory);
BaseResponse<List<CoscoCategoryMaintenanceVO>> selectCategoryTreeNoSuperior(CoscoCategoryMaintenanceVO coscoCategory);
/**
* 获取所有级别名称

67
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
View File

@ -3,10 +3,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.client.CategoryClient;
import com.chinaunicom.mall.ebtp.common.base.client.SystemClient;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
@ -36,6 +35,8 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
private CoscoCategoryMapper coscoCategoryMapper;
@Autowired
private SystemClient systemClient;
@Autowired
private CategoryClient categoryClient;
/**
* 查询品类库_品类
@ -74,8 +75,8 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
return 0;
}
coscoCategory.setAncestors(coscoCategory1.getAncestors() + "," + coscoCategory.getId());
}else{
coscoCategory.setAncestors( CoscoCategoryConstant.LEVEL_TOP+ "," + coscoCategory.getId());
} else {
coscoCategory.setAncestors(CoscoCategoryConstant.LEVEL_TOP + "," + coscoCategory.getId());
}
coscoCategory.setCreateTime(new Date());
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
@ -128,46 +129,54 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
}
@Override
public List<CoscoCategoryVO> selectCategoryTree(CoscoCategory coscoCategory) {
List<CoscoCategory> coscoCategories = coscoCategoryMapper.selectCoscoCategoryList(coscoCategory);
List<CoscoCategoryVO> cosco = new ArrayList<>();
for (CoscoCategory co : coscoCategories) {
cosco.add(BeanUtil.toBean(co, CoscoCategoryVO.class));
}
return buildTree(cosco);
public BaseResponse<List<CoscoCategoryMaintenanceVO>> selectCategoryTree(CoscoCategoryMaintenanceVO coscoCategory) {
;
// List<CoscoCategory> coscoCategories = coscoCategoryMapper.selectCoscoCategoryList(coscoCategory);
// List<CoscoCategoryVO> cosco = new ArrayList<>();
// for (CoscoCategory co : coscoCategories) {
// cosco.add(BeanUtil.toBean(co, CoscoCategoryVO.class));
// }
BaseResponse<List<CoscoCategoryMaintenanceVO>> treeList = categoryClient.getTreeList(coscoCategory);
return treeList;
}
@Override
public List<CoscoCategoryVO> selectCategoryTreeNoSuperior(CoscoCategory coscoCategory) {
public BaseResponse<List<CoscoCategoryMaintenanceVO>> selectCategoryTreeNoSuperior(CoscoCategoryMaintenanceVO coscoCategory) {
/**
* 获取全部上级部门id
*/
List<String> deptIds = new ArrayList<>();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getOrganizationId());
if (orgInfo.isSuccess()) {
SysOrg data = orgInfo.getData();
String orgFullId = data.getOrgFullId();
String[] split = orgFullId.split(",");
List<String> split1 = new ArrayList<>();
for (String s : split) {
if(!currentUser.getOrganizationId().equals(s)){
split1.add(s);
}
}
deptIds.addAll(split1);
}
coscoCategory.setDeptIds(deptIds);
// List<String> deptIds = new ArrayList<>();
// BaseCacheUser currentUser = TokenUtil.getCurrentUser();
// BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getOrganizationId());
// if (orgInfo.isSuccess()) {
// SysOrg data = orgInfo.getData();
// String orgFullId = data.getOrgFullId();
// String[] split = orgFullId.split(",");
// List<String> split1 = new ArrayList<>();
// for (String s : split) {
// if (!currentUser.getOrganizationId().equals(s)) {
// split1.add(s);
// }
// }
// deptIds.addAll(split1);
// }
// coscoCategory.setDeptIds(deptIds);
return selectCategoryTree(coscoCategory);
}
/**
* 获取所有级别名称
*
* @param id
* @return
*/
@Override
public String getCategoryNameById(String id) {
BaseResponse<CoscoCategoryMaintenance> info = categoryClient.getInfo(id);
if (info.isSuccess()) {
CoscoCategoryMaintenance data = info.getData();
return data.getCategoryName();
}
return coscoCategoryMapper.selectCategoryNameById(id);
}

7
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
View File

@ -223,7 +223,6 @@
ccl.id,
ccl.name,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
max(dp.dic_name) AS area,
ccl.create_by,
ccl.apply_dept_id,
ccl.term_of_validity AS termOfValidity,
@ -232,6 +231,7 @@
ccl.last_update_time as approveTime,
ccl.create_time,
ccl.remark,
ccl.area,
CASE
WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NULL THEN '未开始'
WHEN ccl.approve_status = 3 THEN '进行中'
@ -252,7 +252,6 @@
cosco_category_library_supplier_apply cclsa ON cclsa.category_library_id = ccl.id AND cclsa.approve_status = 1
LEFT JOIN
cosco_category_library_supplier ccls ON cclsa.id = ccls.category_library_supplier_apply_id
left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
<where>
and ccl.del_flag = 'normal'
@ -286,7 +285,7 @@
select
ccl.id,
ccl.name,
max(dp.dic_name) AS area,
ccl.area AS area,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
ccl.term_of_validity AS termOfValidity,
ccl.approve_status AS approveStatus,
@ -301,8 +300,6 @@
cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
LEFT JOIN
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId}
<if test="vo.name!=null and vo.name!=''">