From ffcb1db56c3e179cd657524d36ad3018646a3608 Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Thu, 17 Jul 2025 08:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/service/IOrgService.java | 2 +- .../supplier/base/service/IUserService.java | 3 + .../base/service/impl/OrgServiceImpl.java | 49 ++++++------- .../base/service/impl/UserServiceImpl.java | 5 ++ .../CoscoSupplierBaseController.java | 5 +- .../CoscoAccessSupplierCategoryMapper.java | 3 +- .../entity/CoscoAccessSupplierCategory.java | 29 ++++++++ .../coscosupplier/entity/CoscoAccessUser.java | 9 +++ .../service/ICoscoSupplierBaseService.java | 3 +- .../CoscoAccessWorkCategoryServiceImpl.java | 19 +++++ .../impl/CoscoAccessWorkServiceImpl.java | 9 ++- .../impl/CoscoSupplierBaseServiceImpl.java | 30 ++++++-- .../impl/CoscoSupplierexitServiceImpl.java | 1 + .../coscosupplier/vo/AdmissionDetailsVo.java | 46 ------------ .../CoscoAccessSupplierCategoryMapper.xml | 70 ++++++++----------- .../dao/mapper/CoscoSupplierBaseMapper.xml | 5 +- 16 files changed, 157 insertions(+), 131 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/AdmissionDetailsVo.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java index 9edcfdf..23f2030 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java @@ -67,7 +67,7 @@ public interface IOrgService { * 获取当前登录人的本级及下级及上级部门id * @return */ - List levelAndBelowAndAboveOrgIdList(); + List orgDeptIdList(BaseCacheUser user); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java index 5c6bf8d..0bfc06e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java @@ -23,4 +23,7 @@ public interface IUserService{ SysUser getUserById(String id); List getUser(SelectUserVo vo); + + SysUser getUserInfo(String userId); + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java index 598a6dc..f23060a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java @@ -20,6 +20,7 @@ public class OrgServiceImpl implements IOrgService { @Autowired private SystemClient systemClient; + public static final String ORG_ID = "10000000"; /** * 查询组织信息（当前组织及下级组织列表） * @param sysOrg @@ -67,6 +68,9 @@ public class OrgServiceImpl implements IOrgService { */ @Override public BaseResponse> getOrglist(SysOrg param) { + if(StringUtils.isEmpty(param.getUpOrgId())){ + param.setUpOrgId(ORG_ID); + } return systemClient.getOrglist(param); } @@ -158,36 +162,23 @@ public class OrgServiceImpl implements IOrgService { * @return */ @Override - public List levelAndBelowAndAboveOrgIdList() { - // 1. 获取当前用户（判空） - BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - - // 2. 获取组织信息 - BaseResponse baseResponse = systemClient.getOrgInfo(currentUser.getOrganizationId()); - - // 3. 解析 orgFullId - SysOrg sysOrg = baseResponse.getData(); - String orgFullId = sysOrg.getOrgFullId(); - - String[] parts = orgFullId.split(","); - String orgId; - if (parts.length == 1) { - orgId = parts[0]; // 只有一级，返回一级 - } else { - orgId = parts[1]; // 有多级，返回第二级 + public List orgDeptIdList(BaseCacheUser user) { + //获取当前登录人所属部门信息 + BaseResponse baseResponse = systemClient.getOrgInfo(user.getOrganizationId()); + List orgIdList = new ArrayList<>(); + if(!ObjectUtils.isEmpty(baseResponse)){ + //查询当前部门的所属单位下的 所有部门 + SysOrg sysOrgAll = new SysOrg(); + sysOrgAll.setOrgId(baseResponse.getData().getUpOrgId()); + List sysOrgVOList = systemClient.getOrglist(sysOrgAll).getData(); + // 提取 orgId 到 List + orgIdList = Optional.ofNullable(sysOrgVOList) + .orElse(Collections.emptyList()) + .stream() + .map(SysOrg::getOrgId) + .filter(Objects::nonNull) // 过滤掉 null 值 + .collect(Collectors.toList()); } - - // 4. 查询组织数据（判空构造参数） - SysOrg sysOrgAll = new SysOrg(); - sysOrgAll.setOrgId(orgId); - List sysOrgVOList = systemClient.queryAll(sysOrgAll).getData(); - // 提取 orgId 到 List - List orgIdList = Optional.ofNullable(sysOrgVOList) - .orElse(Collections.emptyList()) - .stream() - .map(SysOrgVO::getOrgId) - .filter(Objects::nonNull) // 过滤掉 null 值 - .collect(Collectors.toList()); return orgIdList; } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java index e88ade0..cd75956 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java @@ -37,6 +37,11 @@ public class UserServiceImpl implements IUserService { } + @Override + public SysUser getUserInfo(String userId) { + return systemClient.getUser(userId).getData(); + } + public List getUser(SelectUserVo vo) { BaseResponse> userlist = systemClient.getUserlist(new SysUser()); List list = new ArrayList<>(); 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 ad4049b..e2f306b 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 @@ -9,7 +9,7 @@ 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.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; @@ -123,6 +123,7 @@ public class CoscoSupplierBaseController extends BaseController { BaseCacheUser currentUser = TokenUtil.getCurrentUser(); String userId = currentUser.getUserId();//登录人id coscoSupplierBase.setCreateBy(userId); + coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); return BaseResponse.success(coscoSupplierBaseService.getMySupplierBasePage(coscoSupplierBase)); } @@ -296,7 +297,7 @@ public class CoscoSupplierBaseController extends BaseController { */ @ApiOperation("查询分页数据") @PostMapping("/getCategoryPage") - public BaseResponse> getZrCategoryPage(@ApiParam(value = "对象数据", required = true) @RequestBody AdmissionDetailsVo vo) { + public BaseResponse> getZrCategoryPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessSupplierCategory vo) { //如果id是就自己查 if(StringUtils.isEmpty(vo.getSupplierId())){ //获取登录人信息 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 5a883fd..9a900ec 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 @@ -1,7 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; import org.springframework.data.repository.query.Param; @@ -23,7 +22,7 @@ public interface CoscoAccessSupplierCategoryMapper { */ IPage selectExitCategoryList(IPage page, @Param("vo") CoscoAccessSupplierCategory vo); - IPage selectPageList(IPage page, @Param("vo") AdmissionDetailsVo vo); + IPage selectPageList(IPage page, @Param("vo") CoscoAccessSupplierCategory vo); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java index 006931a..5996fc6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java @@ -58,6 +58,35 @@ public class CoscoAccessSupplierCategory extends CoscoBaseEntity { private List categoryList; + /** + * 退出表id + */ + private String supplierexitId; + + /** + * 准入部门名称 + */ + private String deptName; + + /** + * 搜索条件开始时间 + */ + private String startTime; + /** + * 搜索条件结束时间 + */ + private String endTime; + + /** + * 退出时间 + */ + private String exitTime; + + /** + * 退出原因 + */ + private String exitReason; + /** * 批量删除用 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java index 0c2ddff..d62afa7 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java @@ -52,5 +52,14 @@ public class CoscoAccessUser extends CoscoBaseEntity { //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + /** + * 部门名称 + */ + private String deptName; + + /** + * 人员名称 + */ + private String userName; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java index f1d5548..88a4d5c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java @@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import java.util.List; @@ -23,7 +22,7 @@ public interface ICoscoSupplierBaseService { IPage getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase); - IPage getZrCategoryPage(AdmissionDetailsVo vo); + IPage getZrCategoryPage(CoscoAccessSupplierCategory vo); public List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase); 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 8a84a5e..b24502c 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 @@ -109,6 +109,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplier.setAccessWorkId(workId); coscoAccessSupplier.setSupplierId(sId); coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId()); + coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); coscoAccessSupplierList.add(coscoAccessSupplier); } //品类批量插入 @@ -199,6 +200,24 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg private void approveYandN(CoscoAccessWork coscoAccessWorkData, List supplierAndCateGoryList) { Date date = new Date(); + + //通过工作主体任务id查询供应商信息 + CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); + coscoAccessSupplier.setAccessWorkId(coscoAccessWorkData.getId()); + List supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); + List accessSupplierIdList = new ArrayList<>();//准入供应商表供应商id集合 + for(CoscoAccessSupplier accessSupplier :supplierList ){ + //需要修改准入供应商表id结合 + accessSupplierIdList.add(accessSupplier.getId()); + + } + //批量修改准入供应商表状态 + CoscoAccessSupplier coscoAccessSupplierUp = new CoscoAccessSupplier(); + coscoAccessSupplierUp.setIdList(accessSupplierIdList); + coscoAccessSupplierUp.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); + coscoAccessSupplierMapper.updateCoscoAccessSupplierByIds(coscoAccessSupplierUp); + + //根据任务id与部门id查询需要准入的品类，并且排除每个供应商已存在该部门下的品类 CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(coscoAccessWorkData.getId()); 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 d64c094..f7b5644 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 @@ -112,6 +112,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //准入基础信息 CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id); + SysOrg dept = orgService.getOrgInfo(coscoAccessWork.getDeptId()); + coscoAccessWork.setDeptName(dept.getOrgName());//准入部门 vo.setCoscoAccessWork(coscoAccessWork); //供应商信息 @@ -131,7 +133,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //人员信息 CoscoAccessUser coscoAccessUser = new CoscoAccessUser(); coscoAccessUser.setAccessWorkId(id); - vo.setCoscoAccessUserls(coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser)); + List coscoAccessUserList = coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser); + for(CoscoAccessUser accessUser : coscoAccessUserList){ + //获取评审人的所诉部门 + accessUser.setDeptName(orgService.getOrgInfo(accessUser.getDeptId()).getOrgName()); + } + vo.setCoscoAccessUserls(coscoAccessUserList); //查询附件信息 vo.setCoscoAccessWorkAttachments(coscoAccessWorkAttachmentsMapper.selectCoscoAccessWorkAttachmentsByWorkId(id)); 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 9f3c576..01b5168 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 @@ -15,15 +15,14 @@ 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.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -81,13 +80,22 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getPage(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); - return coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase); + IPage pageData = coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase); + return pageData; } @Override @@ -124,9 +133,16 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getZrCategoryPage(AdmissionDetailsVo vo) { - IPage page = new Page<>(vo.getPageNo(), vo.getPageSize()); - return coscoAccessSupplierCategoryMapper.selectPageList(page, vo); + public IPage getZrCategoryPage(CoscoAccessSupplierCategory vo) { + IPage page = new Page<>(vo.getPageNo(), vo.getPageSize()); + IPage pageData = coscoAccessSupplierCategoryMapper.selectPageList(page, vo); + for(CoscoAccessSupplierCategory category : pageData.getRecords()){ + SysOrg dept = orgService.getOrgInfo(category.getDeptId()); + if(!ObjectUtils.isEmpty(dept)){ + category.setDeptName(dept.getOrgName()); + } + } + return pageData; } @Override 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 f66b15b..7cc8d27 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 @@ -197,6 +197,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { } CoscoAccessSupplierCategory deleteCoscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); deleteCoscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); + deleteCoscoAccessSupplierCategory.setSupplierexitId(coscoSupplierexit.getId()); deleteCoscoAccessSupplierCategory.setCoscoAccessSupplierCategoryList(coscoAccessSupplierCategoryList); coscoAccessSupplierCategoryMapper.batchDeleteCoscoAccessSupplierCategory(deleteCoscoAccessSupplierCategory); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/AdmissionDetailsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/AdmissionDetailsVo.java deleted file mode 100644 index aab80d7..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/AdmissionDetailsVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo; - -import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; -import lombok.Data; - -import java.util.List; - -@Data -public class AdmissionDetailsVo extends CoscoBaseEntity { - - private static final long serialVersionUID = 1L; - //部门id - private String deptId; - - //退出id - private String supplierexitId; - - //退出时间 - private String exitTime; - - //退出原因 - private String exitReason; - - //退出品类id - private String categoryIds; - - //退出品类名 - private String categoryNames; - - //供应商id - private String supplierId; - - //加入黑名单时间 - private String blackTime; - - //开始时间 - private String endTime; - - //结束时间 - private String startTime; - - //品类id - private String categoryId; - - -} 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 7e9043f..ba3ecc4 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 @@ -15,7 +15,8 @@ - + + @@ -32,50 +33,34 @@ c.update_by, c.update_time, c.last_update_time, - c.dept_id + c.dept_id, + c.supplierexit_id, + cse.exit_time as exitTime, + cse.exit_reason as exitReason FROM cosco_access_supplier_category c left join cosco_supplier_base s on c.supplier_id = s.id and s.del_flag = 'normal' left join cosco_category ca on c.category_id = ca.id and ca.del_flag = 'normal' + left join cosco_supplierexit cse on c.supplierexit_id = cse.id and cse.del_flag = 'normal' - + + + + and c.supplier_id = #{vo.supplierId} + + + and c.categoryId = #{vo.categoryId} + + + and c.create_time >= #{vo.startTime} + + + and c.create_time <= #{vo.endTime} + + + ORDER BY c.create_time desc