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 5189c34..2a03a07 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 @@ -57,7 +57,7 @@ public class CoscoAccessSupplierController extends BaseController { // 动态设置导出字段(忽略未标注字段) Set includeFields = new HashSet<>(Arrays.asList( - "supplierName","supplierTypeCn", "accessTypeText","categoryNameList","updateYear" // 指定要导出的字段名 + "supplierName","supplierTypeCn", "accessTypeText","categoryNameList","orgName","deptName","updateYear" // 指定要导出的字段名 )); String fileName = URLEncoder.encode("供应商准入情况统计.xlsx", "UTF-8"); 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 8716515..a595599 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 @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierUser.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierUser.java index eac84f2..8fec693 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierUser.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierUser.java @@ -50,10 +50,6 @@ public class CoscoSupplierUser extends CoscoBaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastUpdateTime; - /** - * 新增品类id集合 - */ - private List categoryIdList; private List categoryNameList; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java index 57f8ea2..dfa8923 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java @@ -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 supplierList, List categoryIdList); + public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData, List supplierList, List categoryIdList); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java index 74713ae..806601d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java @@ -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 supplierList,List categoryIdList) { + public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData,List supplierList,List categoryIdList) { //aop返回对象,消息推送用 CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo(); @@ -123,13 +120,15 @@ public class CoscoAccessSupplierCategoryServiceImpl implements ICoscoAccessSuppl //品类准入新增 List 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); 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 1375a2d..8e3f5cd 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 @@ -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 accessSupplierIPage = new Page<>(coscoAccessSupplier.getPageNo(), coscoAccessSupplier.getPageSize()); IPage 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 selectCoscoAccessSupplierAndWorkExecList(CoscoAccessSupplier coscoAccessSupplier) { List 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; } 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 819ef6c..c5300d9 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 @@ -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 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 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)) { 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 71fdecd..fb56489 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 @@ -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 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 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 coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory); List coscoAccessSupplierCategoryInsertList = new ArrayList<>(); - List supplierBaseIdList = new ArrayList<>(); List 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 categoryIdList) { + public void sporadicHandling(CoscoAccessWork coscoAccessWorkData,List categoryIdList) { //通过工作主体任务id查询供应商信息--因为需要给供应商发送准入申请通过的消息 CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); 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 c930f72..0435d00 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 @@ -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 getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); 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; } @@ -208,7 +199,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl coscoSupplierBaseList = coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase); for (CoscoSupplierBase supplierBase : coscoSupplierBaseList){ - String[] categoryIds = supplierBase.getCategoryId().split(","); - List categoryIdList = Arrays.asList(categoryIds); - List 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 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 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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java index 6a6ef64..01db254 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java @@ -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 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 getPage(CoscoSupplierUser coscoSupplierUser) { IPage page = new Page<>(coscoSupplierUser.getPageNo(), coscoSupplierUser.getPageSize()); 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; } @@ -121,13 +102,11 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService { } String supplierUserId = PropertyUtils.getSnowflakeId(); //新增品类 - if(!CollectionUtils.isEmpty(coscoSupplierUser.getCategoryIdList())){ + if(!CollectionUtils.isEmpty(coscoSupplierUser.getCoscoSupplierUserCategoryList())){ List 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 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); } 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 1cf3ae0..354ad74 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,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 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()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessWorkVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessWorkVo.java index 3f787d3..bd9d565 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessWorkVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessWorkVo.java @@ -15,11 +15,6 @@ public class CoscoAccessWorkVo { @Valid // 关键注解:启用嵌套验证 private CoscoAccessWork coscoAccessWork; - //准入申请关联品类id集合 - @NotNull(message = "准入品类不能为空") - @Valid - private List categoryIds; - //准入申请供应商id集合 @NotNull(message = "准入供应商不能为空") @Valid @@ -38,7 +33,7 @@ public class CoscoAccessWorkVo { //查看详情,回显用的供应商集合 private List coscoAccessSupplierList; - //查看详情,回显用的品类集合 + //查看详情,回显用的品类集合 / 准入申请关联品类id集合 private List coscoAccessCategoryList; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index 77c44fa..4706732 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -28,7 +28,10 @@ public class SupplierPageVo { */ private String orgId; - + /** + * 单位名称 + */ + private String orgName; /** * 部门ID */ 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 8aaf4a8..662e29e 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 @@ -7,10 +7,11 @@ + - 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 SELECT cac.category_id, + cac.category_name, cas.supplier_id, CASE WHEN csb.supplier_type = 'ovs' THEN @@ -47,18 +49,20 @@ access_work_id, category_id, + category_name, #{accessWorkId}, #{categoryId}, + #{categoryName}, insert into cosco_access_category - ( access_work_id, category_id) + ( access_work_id, category_id,category_name) values - ( #{item.accessWorkId}, #{item.categoryId}) + ( #{item.accessWorkId}, #{item.categoryId}, #{item.categoryName}) diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml index d3fcf18..3b7b487 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml @@ -9,6 +9,7 @@ + @@ -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 @@ access_work_id, supplier_id, category_id, + category_name, del_flag, create_by, create_time, @@ -197,6 +201,7 @@ #{accessWorkId}, #{supplierId}, #{categoryId}, + #{categoryName}, #{delFlag}, #{createBy}, #{createTime}, @@ -210,10 +215,10 @@ 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 - ( #{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}) 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 68c7340..6a3a130 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,8 +14,8 @@ - @@ -90,8 +90,8 @@ - select c.category_id from cosco_access_category c + select c.category_name from cosco_access_category c where c.access_work_id = #{accessWorkId} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserCategoryMapper.xml index f1f53e7..5d992ec 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierUserCategoryMapper.xml @@ -7,10 +7,11 @@ + - select supplier_user_id, category_id + select supplier_user_id, category_id,category_name from cosco_supplier_user_category @@ -34,18 +35,20 @@ supplier_user_id, category_id, + category_name, #{supplierUserId}, #{categoryId}, + #{categoryName}, insert into cosco_supplier_user_category - ( supplier_user_id, category_id) + ( supplier_user_id, category_id,category_name) values - ( #{item.supplierUserId}, #{item.categoryId}) + ( #{item.supplierUserId}, #{item.categoryId}, #{item.categoryName}) 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 aa4765d..7d9d040 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 @@ -30,8 +30,6 @@ - - @@ -56,7 +54,8 @@