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

修改品类名称

Browse Source
This commit is contained in:
TL
2025-07-29 14:45:45 +08:00
parent 98ae056ada
commit caa3125cde
21 changed files with 93 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java
View File

@ -57,7 +57,7 @@ public class CoscoAccessSupplierController extends BaseController {
// 动态设置导出字段（忽略未标注字段）
Set<String> includeFields = new HashSet<>(Arrays.asList(
"supplierName","supplierTypeCn", "accessTypeText","categoryNameList","updateYear" // 指定要导出的字段名
"supplierName","supplierTypeCn", "accessTypeText","categoryNameList","orgName","deptName","updateYear" // 指定要导出的字段名
));
String fileName = URLEncoder.encode("供应商准入情况统计.xlsx", "UTF-8");

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java
View File

@ -23,11 +23,16 @@ public class CoscoAccessSupplier extends CoscoBaseEntity {
//准入单位
private String orgId;
//准入单位
@ExcelProperty("准入单位")
private String orgName;
//准入部门id
private String deptId;
//准入部门名称
@ExcelProperty("准入部门")
private String deptName;
//供应商准入状态（0.未准入、1.已准入、2.退出）
private Long accessStatus;
private String accessStatusCn;

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierUser.java
View File

@ -50,10 +50,6 @@ public class CoscoSupplierUser extends CoscoBaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastUpdateTime;
/**
* 新增品类id集合
*/
private List<String> categoryIdList;
private List<String> categoryNameList;

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
@ -68,7 +69,7 @@ public interface ICoscoAccessSupplierCategoryService {
* @param categoryIdList
* @return
*/
public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData, List<CoscoAccessSupplier> supplierList, List<String> categoryIdList);
public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData, List<CoscoAccessSupplier> supplierList, List<CoscoAccessCategory> categoryIdList);

13
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java
View File

@ -8,10 +8,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
import org.springframework.beans.factory.annotation.Autowired;
@ -112,7 +109,7 @@ public class CoscoAccessSupplierCategoryServiceImpl implements ICoscoAccessSuppl
*/
@Transactional
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSZR)
public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData,List<CoscoAccessSupplier> supplierList,List<String> categoryIdList) {
public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData,List<CoscoAccessSupplier> supplierList,List<CoscoAccessCategory> categoryIdList) {
//aop返回对象,消息推送用
CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo();
@ -123,13 +120,15 @@ public class CoscoAccessSupplierCategoryServiceImpl implements ICoscoAccessSuppl
//品类准入新增
List<CoscoAccessSupplierCategory> coscoAccessSupplierCategoryInsertList = new ArrayList<>();
for(CoscoAccessSupplier supplier : supplierList ){
for (String categoryId : categoryIdList){
for (CoscoAccessCategory category : categoryIdList){
CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory();
coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId());
coscoAccessSupplierCategory.setAccessWorkId(coscoAccessWorkData.getId());
coscoAccessSupplierCategory.setSupplierId(supplier.getSupplierId());
coscoAccessSupplierCategory.setCategoryId(categoryId);
coscoAccessSupplierCategory.setCategoryId(category.getCategoryId());
coscoAccessSupplierCategory.setCategoryName(category.getCategoryName());
coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId());
coscoAccessSupplierCategory.setOrgId(coscoAccessWorkData.getOrgId());
coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy());
coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy());
coscoAccessSupplierCategory.setCreateTime(date);

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java
View File

@ -4,14 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.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.CoscoAccessSupplierMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserItemMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -34,9 +35,9 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi
private CoscoAccessUserItemMapper coscoAccessUserItemMapper;
@Autowired
private CoscoAccessUserMapper coscoAccessUserMapper;
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Autowired
private IOrgService orgService;
/**
* 查询供应商准入_关联供应商
*
@ -53,7 +54,9 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi
IPage<CoscoAccessSupplier> accessSupplierIPage = new Page<>(coscoAccessSupplier.getPageNo(), coscoAccessSupplier.getPageSize());
IPage<CoscoAccessSupplier> pageData = coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkPageList(accessSupplierIPage,coscoAccessSupplier);
for(CoscoAccessSupplier accessSupplier : pageData.getRecords()){
accessSupplier.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(accessSupplier.getCategoryIdList()));
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(accessSupplier.getDeptId());
accessSupplier.setOrgName(orgDeptVo.getOrgName());
accessSupplier.setDeptName(orgDeptVo.getDeptName());
}
return pageData;
}
@ -62,7 +65,9 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi
public List<CoscoAccessSupplier> selectCoscoAccessSupplierAndWorkExecList(CoscoAccessSupplier coscoAccessSupplier) {
List<CoscoAccessSupplier> coscoAccessSupplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkExecList(coscoAccessSupplier);
for(CoscoAccessSupplier accessSupplier : coscoAccessSupplierList){
accessSupplier.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(accessSupplier.getCategoryIdList()));
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(accessSupplier.getDeptId());
accessSupplier.setOrgName(orgDeptVo.getOrgName());
accessSupplier.setDeptName(orgDeptVo.getDeptName());
}
return coscoAccessSupplierList;
}

17
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
View File

@ -10,7 +10,6 @@ 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.CoscoAccessCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
@ -55,8 +54,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
private CoscoAccessSupplierMapper coscoAccessSupplierMapper;
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Autowired
private IOrgService orgService;
@ -102,11 +99,9 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
//品类集合
List<CoscoAccessCategory> coscoAccessCategoryList = new ArrayList<>();
for(String cId : vo.getCategoryIds()){
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(workId);
coscoAccessCategory.setCategoryId(cId);
coscoAccessCategoryList.add(coscoAccessCategory);
for(CoscoAccessCategory category : vo.getCoscoAccessCategoryList()){
category.setAccessWorkId(workId);
coscoAccessCategoryList.add(category);
}
@ -151,9 +146,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(id);
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
for(CoscoAccessCategory accessCategory : coscoAccessCategoryList){
accessCategory.setCategoryName(coscoCategoryService.getCategoryNameById(accessCategory.getCategoryId()));
}
vo.setCoscoAccessCategoryList(coscoAccessCategoryList);
return vo;
@ -244,6 +236,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
coscoAccessSupplierCategory.setAccessWorkId(coscoAccessWorkData.getId());
coscoAccessSupplierCategory.setSupplierId(accessCategory.getSupplierId());
coscoAccessSupplierCategory.setCategoryId(accessCategory.getCategoryId());
coscoAccessSupplierCategory.setCategoryName(accessCategory.getCategoryName());
coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy());
coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy());
coscoAccessSupplierCategory.setOrgId(coscoAccessWorkData.getOrgId());
@ -255,7 +248,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
coscoAccessSupplierCategoryList.add(coscoAccessSupplierCategory);
//消息用
accessCategory.setCategoryName(coscoCategoryService.getCategoryNameById(accessCategory.getCategoryId()));
accessCategory.setCategoryName(accessCategory.getCategoryName());
supplierAndCateGoryList.add(accessCategory);
}
if (!CollectionUtils.isEmpty(coscoAccessSupplierCategoryList)) {

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -3,8 +3,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrgVO;
import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
@ -15,7 +13,6 @@ 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.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
@ -41,8 +38,6 @@ import java.util.List;
@Service
public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Autowired
private ICoscoAccessSupplierCategoryService coscoAccessSupplierCategoryService;
@Autowired
@ -102,7 +97,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setOrgName(orgDeptVo.getOrgName());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
coscoAccessWork.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(coscoAccessWork.getCategoryIdList()));
}
return pageData;
}
@ -117,7 +111,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setOrgName(orgDeptVo.getOrgName());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
coscoAccessWork.setCategoryNameList(coscoCategoryService.getCategoryNameListByIds(coscoAccessWork.getCategoryIdList()));
}
return pageData;
}
@ -147,9 +140,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(id);
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
for(CoscoAccessCategory accessCategory : coscoAccessCategoryList){
accessCategory.setCategoryName(coscoCategoryService.getCategoryNameById(accessCategory.getCategoryId()));
}
vo.setCoscoAccessCategoryList(coscoAccessCategoryList);
//人员信息
@ -283,7 +273,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//如果是零星采购/应急采购、审批状态直接为通过
coscoAccessWork.setApproveStatus(CoscoType.ACCESS_STATUS_YZR);
//零星采购，直接把准入品类添加到已准入品类表，并给供应商发送消息
sporadicHandling(coscoAccessWork,vo.getCategoryIds());
sporadicHandling(coscoAccessWork,vo.getCoscoAccessCategoryList());
//新增零星采购需要的附件
addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_SCATTERED,userId);
}
@ -468,11 +458,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
private void addCateGoryId(CoscoAccessWorkVo vo, String workId) {
//品类集合
List<CoscoAccessCategory> coscoAccessCategoryList = new ArrayList<>();
for(String categoryId : vo.getCategoryIds()){
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(workId);
coscoAccessCategory.setCategoryId(categoryId);
coscoAccessCategoryList.add(coscoAccessCategory);
for(CoscoAccessCategory category : vo.getCoscoAccessCategoryList()){
category.setAccessWorkId(workId);
coscoAccessCategoryList.add(category);
}
coscoAccessCategoryMapper.batchCoscoAccessCategory(coscoAccessCategoryList);
@ -699,7 +687,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
List<CoscoAccessSupplierCategory> coscoAccessSupplierCategoryInsertList = new ArrayList<>();
List<String> supplierBaseIdList = new ArrayList<>();
List<String> accessSupplierIdList = new ArrayList<>();
@ -710,6 +697,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
coscoAccessSupplierCategory.setAccessWorkId(coscoAccessWorkData.getId());
coscoAccessSupplierCategory.setSupplierId(accessSupplier.getSupplierId());
coscoAccessSupplierCategory.setCategoryId(accessCategory.getCategoryId());
coscoAccessSupplierCategory.setCategoryName(accessCategory.getCategoryName());
coscoAccessSupplierCategory.setOrgId(coscoAccessWorkData.getOrgId());
coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId());
coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy());
@ -726,8 +714,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
if(StringUtils.isEmpty(coscoSupplierBase.getSapCode())){
sapCode = dtService.maintain(coscoSupplierBase);
}
//需要修改供应商id结合
//supplierBaseIdList.add(accessSupplier.getSupplierId());
//批量修改供应商基础信息状态---需要修改sapCode
CoscoSupplierBase batchUpCoscoSupplierBase = new CoscoSupplierBase();
@ -777,7 +763,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
* 供应商准入零星采购/应急采购处理
* @return
*/
public void sporadicHandling(CoscoAccessWork coscoAccessWorkData,List<String> categoryIdList) {
public void sporadicHandling(CoscoAccessWork coscoAccessWorkData,List<CoscoAccessCategory> categoryIdList) {
//通过工作主体任务id查询供应商信息--因为需要给供应商发送准入申请通过的消息
CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
View File

@ -16,7 +16,6 @@ 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.*;
@ -92,8 +91,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
private CoscoAccessSupplierMapper coscoAccessSupplierMapper;
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Autowired
private IOrgService orgService;
@ -185,12 +182,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
public IPage<CoscoSupplierBase> getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase) {
IPage<CoscoSupplierBase> page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize());
IPage<CoscoSupplierBase> pageData = coscoSupplierBaseMapper.getMySupplierBasePage(page, coscoSupplierBase);
for (CoscoSupplierBase supplierBase : pageData.getRecords()){
String[] categoryIds = supplierBase.getCategoryId().split(",");
List<String> categoryIdList = Arrays.asList(categoryIds);
List<String> categoryNameList = coscoCategoryService.getCategoryNameListByIds(categoryIdList);
supplierBase.setCategoryName(String.join(",", categoryNameList));
}
return pageData;
}
@ -208,7 +199,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId());
category.setOrgName(orgDeptVo.getOrgName());
category.setDeptName(orgDeptVo.getDeptName());
category.setCategoryName(coscoCategoryService.getCategoryNameById(category.getCategoryId()));
}
return pageData;
}
@ -218,10 +208,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
List<CoscoSupplierBase> coscoSupplierBaseList = coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase);
for (CoscoSupplierBase supplierBase : coscoSupplierBaseList){
String[] categoryIds = supplierBase.getCategoryId().split(",");
List<String> categoryIdList = Arrays.asList(categoryIds);
List<String> categoryNameList = coscoCategoryService.getCategoryNameListByIds(categoryIdList);
supplierBase.setCategoryName(String.join(",", categoryNameList));
supplierBase.setEnterpriseTypeCn(dictService.getDictName(supplierBase.getEnterpriseType(),CoscoType.ENTERPRISE_TYPE));
}
return coscoSupplierBaseList;
@ -543,15 +529,9 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
IPage<SupplierPageVo> supplierPage = coscoSupplierBaseMapper.getSupplierPage(page, supplierPageVo);
supplierPage.getRecords().forEach(vo -> {
if(vo.getDeptId()!=null){
SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId());
if (orgInfo != null) {
vo.setDeptName(orgInfo.getOrgName());
}
}
if(vo.getCategoryIds()!=null && vo.getCategoryIds().length()>0){
String[] split = vo.getCategoryIds().split(",");
List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
vo.setCategoryName(String.join(",", categoryNameListByIds));
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(vo.getDeptId());
vo.setOrgName(orgDeptVo.getOrgName());
vo.setDeptName(orgDeptVo.getDeptName());
}
});
return supplierPage;

41
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.chinaunicom.mall.ebtp.common.base.entity.SysSupplierUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierUserMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser;
@ -39,8 +38,6 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService {
@Autowired
private ICoscoSupplierUserCategoryService coscoSupplierUserCategoryService;
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Autowired
private ICoscoSupplierBaseService coscoSupplierBaseService;
@ -57,16 +54,7 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService {
*/
@Override
public CoscoSupplierUser selectCoscoSupplierUserById(String id) {
CoscoSupplierUser coscoSupplierUser = new CoscoSupplierUser();
coscoSupplierUser = coscoSupplierUserMapper.selectCoscoSupplierUserById(id);
if(!CollectionUtils.isEmpty(coscoSupplierUser.getCoscoSupplierUserCategoryList())){
List<String> categoryName = new ArrayList<>();
for(CoscoSupplierUserCategory coscoSupplierUserCategory : coscoSupplierUser.getCoscoSupplierUserCategoryList()){
categoryName.add(coscoCategoryService.getCategoryNameById(coscoSupplierUserCategory.getCategoryId()));
}
coscoSupplierUser.setCategoryNameList(categoryName);
}
return coscoSupplierUser;
return coscoSupplierUserMapper.selectCoscoSupplierUserById(id);
}
/**
@ -94,13 +82,6 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService {
public IPage<CoscoSupplierUser> getPage(CoscoSupplierUser coscoSupplierUser) {
IPage<CoscoSupplierUser> page = new Page<>(coscoSupplierUser.getPageNo(), coscoSupplierUser.getPageSize());
IPage<CoscoSupplierUser> pageData = coscoSupplierUserMapper.selectCoscoSupplierUserPage(page,coscoSupplierUser);
for(CoscoSupplierUser user : pageData.getRecords()){
List<CoscoSupplierUserCategory> coscoSupplierUserCategoryList = user.getCoscoSupplierUserCategoryList();
for(CoscoSupplierUserCategory coscoSupplierUserCategory : coscoSupplierUserCategoryList){
coscoSupplierUserCategory.setCategoryName(coscoCategoryService.getCategoryNameById(coscoSupplierUserCategory.getCategoryId()));
}
}
return pageData;
}
@ -121,13 +102,11 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService {
}
String supplierUserId = PropertyUtils.getSnowflakeId();
//新增品类
if(!CollectionUtils.isEmpty(coscoSupplierUser.getCategoryIdList())){
if(!CollectionUtils.isEmpty(coscoSupplierUser.getCoscoSupplierUserCategoryList())){
List<CoscoSupplierUserCategory> coscoSupplierUserCategoryList = new ArrayList<>();
for(String categoryId: coscoSupplierUser.getCategoryIdList()){
CoscoSupplierUserCategory coscoSupplierUserCategory = new CoscoSupplierUserCategory();
coscoSupplierUserCategory.setSupplierUserId(supplierUserId);
coscoSupplierUserCategory.setCategoryId(categoryId);
coscoSupplierUserCategoryList.add(coscoSupplierUserCategory);
for(CoscoSupplierUserCategory category: coscoSupplierUser.getCoscoSupplierUserCategoryList()){
category.setSupplierUserId(supplierUserId);
coscoSupplierUserCategoryList.add(category);
}
coscoSupplierUserCategoryService.batchCoscoSupplierUserCategory(coscoSupplierUserCategoryList);
}
@ -160,13 +139,11 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService {
coscoSupplierUserCategoryService.deleteCoscoSupplierUserCategoryBySupplierUserId(coscoSupplierUser.getId());
//新增品类
if(!CollectionUtils.isEmpty(coscoSupplierUser.getCategoryIdList())){
if(!CollectionUtils.isEmpty(coscoSupplierUser.getCoscoSupplierUserCategoryList())){
List<CoscoSupplierUserCategory> coscoSupplierUserCategoryList = new ArrayList<>();
for(String categoryId: coscoSupplierUser.getCategoryIdList()){
CoscoSupplierUserCategory coscoSupplierUserCategory = new CoscoSupplierUserCategory();
coscoSupplierUserCategory.setSupplierUserId(coscoSupplierUser.getId());
coscoSupplierUserCategory.setCategoryId(categoryId);
coscoSupplierUserCategoryList.add(coscoSupplierUserCategory);
for(CoscoSupplierUserCategory category: coscoSupplierUser.getCoscoSupplierUserCategoryList()){
category.setSupplierUserId(coscoSupplierUser.getId());
coscoSupplierUserCategoryList.add(category);
}
coscoSupplierUserCategoryService.batchCoscoSupplierUserCategory(coscoSupplierUserCategoryList);
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
View File

@ -9,7 +9,6 @@ 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.*;
@ -53,8 +52,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
@Autowired
private IOrgService orgService;
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Override
public IPage<CoscoSupplierexit> getPage(CoscoSupplierexit data) {
@ -81,8 +78,6 @@ 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;
}
@ -96,7 +91,6 @@ 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;
}
@ -219,7 +213,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
coscoAccessSupplierCategory.setSupplierId(coscoSupplierexitSupplierCategory.getSupplierId());
coscoAccessSupplierCategoryList.add(coscoAccessSupplierCategory);
coscoSupplierexitSupplierCategory.setCategoryName(coscoCategoryService.getCategoryNameById(coscoSupplierexitSupplierCategory.getCategoryId()));
}
CoscoAccessSupplierCategory deleteCoscoAccessSupplierCategory = new CoscoAccessSupplierCategory();
deleteCoscoAccessSupplierCategory.setOrgId(coscoSupplierexit.getOrgId());

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessWorkVo.java
View File

@ -15,11 +15,6 @@ public class CoscoAccessWorkVo {
@Valid // 关键注解：启用嵌套验证
private CoscoAccessWork coscoAccessWork;
//准入申请关联品类id集合
@NotNull(message = "准入品类不能为空")
@Valid
private List<String> categoryIds;
//准入申请供应商id集合
@NotNull(message = "准入供应商不能为空")
@Valid
@ -38,7 +33,7 @@ public class CoscoAccessWorkVo {
//查看详情，回显用的供应商集合
private List<CoscoAccessSupplier> coscoAccessSupplierList;
//查看详情，回显用的品类集合
//查看详情，回显用的品类集合 / 准入申请关联品类id集合
private List<CoscoAccessCategory> coscoAccessCategoryList;

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
View File

@ -28,7 +28,10 @@ public class SupplierPageVo {
*/
private String orgId;
/**
* 单位名称
*/
private String orgName;
/**
* 部门ID
*/

10
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml
View File

@ -7,10 +7,11 @@
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory" id="CoscoAccessCategoryResult">
<result property="accessWorkId" column="access_work_id"/>
<result property="categoryId" column="category_id"/>
<result property="categoryName" column="category_name"/>
</resultMap>
<sql id="selectCoscoAccessCategoryVo">
select c.access_work_id, c.category_id from cosco_access_category c
select c.access_work_id, c.category_id,c.category_name from cosco_access_category c
</sql>
<select id="selectCoscoAccessCategoryList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory" resultMap="CoscoAccessCategoryResult">
@ -23,6 +24,7 @@
<select id="selectCoscoAccessCategoryByDeptIdList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory" resultMap="CoscoAccessCategoryResult">
SELECT
cac.category_id,
cac.category_name,
cas.supplier_id,
CASE
WHEN csb.supplier_type = 'ovs' THEN
@ -47,18 +49,20 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="accessWorkId != null">access_work_id,</if>
<if test="categoryId != null">category_id,</if>
<if test="categoryName != null">category_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="accessWorkId != null">#{accessWorkId},</if>
<if test="categoryId != null">#{categoryId},</if>
<if test="categoryName != null">#{categoryName},</if>
</trim>
</insert>
<insert id="batchCoscoAccessCategory" parameterType="java.util.List">
insert into cosco_access_category
( access_work_id, category_id)
( access_work_id, category_id,category_name)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.accessWorkId}, #{item.categoryId})
( #{item.accessWorkId}, #{item.categoryId}, #{item.categoryName})
</foreach>
</insert>
<update id="updateCoscoAccessCategory" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory">

9
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml
View File

@ -9,6 +9,7 @@
<result property="accessWorkId" column="access_work_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="categoryId" column="category_id"/>
<result property="categoryName" column="category_name"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@ -27,6 +28,7 @@
c.access_work_id,
c.supplier_id,
c.category_id,
c.category_name,
c.del_flag,
c.create_by,
c.create_time,
@ -130,6 +132,7 @@
c.access_work_id,
c.supplier_id,
c.category_id,
c.category_name,
c.dept_id,
c.del_flag,
c.create_by,
@ -182,6 +185,7 @@
<if test="accessWorkId != null and accessWorkId != ''">access_work_id,</if>
<if test="supplierId != null and supplierId != ''">supplier_id,</if>
<if test="categoryId != null">category_id,</if>
<if test="categoryName != null">category_name,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -197,6 +201,7 @@
<if test="accessWorkId != null and accessWorkId != ''">#{accessWorkId},</if>
<if test="supplierId != null and supplierId != ''">#{supplierId},</if>
<if test="categoryId != null">#{categoryId},</if>
<if test="categoryName != null">#{categoryName},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -210,10 +215,10 @@
</insert>
<insert id="batchCoscoAccessSupplierCategory" parameterType="java.util.List">
insert into cosco_access_supplier_category
( id, access_work_id, supplier_id, category_id, create_by, create_time, update_by, update_time, last_update_time,dept_id,org_id)
( id, access_work_id, supplier_id, category_id,category_name, create_by, create_time, update_by, update_time, last_update_time,dept_id,org_id)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.accessWorkId}, #{item.supplierId}, #{item.categoryId}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime},#{item.deptId},#{item.orgId})
( #{item.id}, #{item.accessWorkId}, #{item.supplierId}, #{item.categoryId}, #{item.categoryName}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime},#{item.deptId},#{item.orgId})
</foreach>
</insert>
<update id="updateCoscoAccessSupplierCategory" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory">

8
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml
View File

@ -14,8 +14,8 @@
<result property="orgId" column="org_id"/>
<result property="deptId" column="dept_id"/>
<result property="supplierexitId" column="supplierexit_id"/>
<collection property="categoryIdList"
column="{supplierId=supplier_id}"
<collection property="categoryNameList"
column="{supplierId=supplier_id,orgId=org_id}"
ofType="string"
select="selectCoscoAccessCategoryList">
</collection>
@ -90,8 +90,8 @@
<select id="selectCoscoAccessCategoryList"
parameterType="map"
resultType="string">
select c.category_id from cosco_access_supplier_category c
where c.supplier_id = #{supplierId} and c.del_flag = 'normal'
select c.category_name from cosco_access_supplier_category c
where c.supplier_id = #{supplierId} and c.org_id = #{orgId} and c.del_flag = 'normal'
</select>
<select id="selectCoscoAccessSupplierList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier" resultMap="CoscoAccessSupplierResult">

5
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml
View File

@ -23,7 +23,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<collection property="categoryIdList"
<collection property="categoryNameList"
column="{accessWorkId=id}"
ofType="string"
select="selectCoscoAccessCategoryList">
@ -43,6 +43,7 @@
w.org_id,
w.dept_id,
w.access_type,
w.access_desc,
CASE
WHEN w.access_type = 'online' THEN '线上准入'
WHEN w.access_type = 'offline' THEN '线下准入'
@ -123,7 +124,7 @@
<select id="selectCoscoAccessCategoryList"
parameterType="map"
resultType="string">
select c.category_id from cosco_access_category c
select c.category_name from cosco_access_category c
where c.access_work_id = #{accessWorkId}
</select>
<select id="selectPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork" resultMap="CoscoAccessWorkResult">

23
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
View File

@ -138,7 +138,7 @@
<!-- 我的供应商 -->
<sql id="selectMySupplierBaseVo">
SELECT
c.categoryId,
c.categoryName,
CASE supplier_type
WHEN 'dvs' THEN '境内企业'
WHEN 'ovs' THEN '境外企业'
@ -170,7 +170,7 @@
left join (
SELECT
cac.access_work_id,
GROUP_CONCAT(cac.category_id SEPARATOR ', ') AS categoryId
GROUP_CONCAT(cac.category_name SEPARATOR ', ') AS categoryName
FROM cosco_access_category cac
GROUP BY cac.access_work_id
) as c on c.access_work_id = caw.id
@ -980,9 +980,9 @@
WHEN csb.supplier_type = 'pe' THEN id_card
ELSE NULL
END AS unifiedCode,
GROUP_CONCAT(caw.dept_id) as dept_id,
GROUP_CONCAT(caw.dept_id) as deptId,
max(caw.update_time) AS admissionTime,
GROUP_CONCAT(DISTINCT casc.category_id SEPARATOR ', ') AS categoryIds
GROUP_CONCAT(DISTINCT casc.category_name SEPARATOR ', ') AS categoryName
from
cosco_access_supplier_category as casc
join cosco_supplier_base as csb on casc.supplier_id = csb.id -- 供应商已准入品类
@ -996,13 +996,7 @@
WHERE b.supplier_id = csb.id
AND cb.approve_status = 1
AND (cb.restore_approve_status is null or cb.restore_approve_status!=1)
-- 添加当前部门及上级部门id
<if test="vo.blackListDept != null and vo.blackListDept.size > 0">
AND cb.dept_id IN
<foreach item="dept" collection="vo.blackListDept" open="(" separator="," close=")">
#{dept}
</foreach>
</if>
AND cb.org_id = #{vo.orgId}
)
and csb.access_status=1
and casc.del_flag='normal'
@ -1025,13 +1019,6 @@
#{id}
</foreach>
</if>
<if test="vo.deptList != null and vo.deptList.size > 0">
AND casc.dept_id IN
<foreach item="dept" collection="vo.deptList" open="(" separator="," close=")">
#{dept}
</foreach>
</if>
group by csb.id
order by csb.create_time desc
</select>

9
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserCategoryMapper.xml
View File

@ -7,10 +7,11 @@
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUserCategory" id="CoscoSupplierUserCategoryResult">
<result property="supplierUserId" column="supplier_user_id"/>
<result property="categoryId" column="category_id"/>
<result property="categoryName" column="category_name"/>
</resultMap>
<sql id="selectCoscoSupplierUserCategoryVo">
select supplier_user_id, category_id
select supplier_user_id, category_id,category_name
from cosco_supplier_user_category
</sql>
@ -34,18 +35,20 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="supplierUserId != null">supplier_user_id,</if>
<if test="categoryId != null">category_id,</if>
<if test="categoryName != null">category_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="supplierUserId != null">#{supplierUserId},</if>
<if test="categoryId != null">#{categoryId},</if>
<if test="categoryName != null">#{categoryName},</if>
</trim>
</insert>
<insert id="batchCoscoSupplierUserCategory" parameterType="java.util.List">
insert into cosco_supplier_user_category
( supplier_user_id, category_id)
( supplier_user_id, category_id,category_name)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.supplierUserId}, #{item.categoryId})
( #{item.supplierUserId}, #{item.categoryId}, #{item.categoryName})
</foreach>
</insert>
<update id="updateCoscoSupplierUserCategory" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUserCategory">

5
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserMapper.xml
View File

@ -30,8 +30,6 @@
<result property="supplierUserId" column="supplier_user_id"/>
<result property="categoryId" column="category_id"/>
<result property="categoryName" column="category_name"/>
</resultMap>
<sql id="selectCoscoSupplierUserVo">
@ -56,7 +54,8 @@
<select id="selectCoscoSupplierUserCategoryByCoscoSupplierUserId" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUserCategory" resultMap="CoscoSupplierUserCategoryResult">
SELECT
csuc.supplier_user_id,
csuc.category_id
csuc.category_id,
csuc.category_name
FROM
cosco_supplier_user_category csuc
where supplier_user_id = #{supplierUserId}

10
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml
View File

@ -8,6 +8,7 @@
<result property="supplierexitId" column="supplierexit_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="categoryId" column="category_id"/>
<result property="categoryName" column="category_name"/>
<result property="exitTheme" column="exit_theme"/>
<result property="deptId" column="dept_id"/>
<result property="createTime" column="create_time"/>
@ -23,7 +24,8 @@
name_en ELSE name END AS supplierName,
sc.supplierexit_id,
sc.supplier_id,
sc.category_id
sc.category_id,
sc.category_name
FROM
cosco_supplierexit_supplier_category sc
left join cosco_supplierexit e on sc.supplierexit_id = e.id
@ -71,19 +73,21 @@
<if test="supplierexitId != null">supplierexit_id,</if>
<if test="supplierId != null">supplier_id,</if>
<if test="categoryId != null">category_id,</if>
<if test="categoryName != null">category_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="supplierexitId != null">#{supplierexitId},</if>
<if test="supplierId != null">#{supplierId},</if>
<if test="categoryId != null">#{categoryId},</if>
<if test="categoryName != null">#{categoryName},</if>
</trim>
</insert>
<insert id="batchCoscoSupplierexitSupplierCategory" parameterType="java.util.List">
insert into cosco_supplierexit_supplier_category
( supplierexit_id, supplier_id, category_id)
( supplierexit_id, supplier_id, category_id, category_name)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.supplierexitId}, #{item.supplierId}, #{item.categoryId})
( #{item.supplierexitId}, #{item.supplierId}, #{item.categoryId}, #{item.categoryName})
</foreach>
</insert>
<update id="updateCoscoSupplierexitSupplierCategory" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory">