diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index 1d251fa..09430ad 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.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.SysUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; @@ -150,8 +151,13 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary); coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> { - OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getDeptId()); + OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getApplyDeptId()); coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName()); + SysUser userById = userService.getUserById(coscoCategoryLibraryVo.getCreateBy()); + if(userById!=null){ + coscoCategoryLibraryVo.setCreateName(userById.getName()); + } + }); return coscoCategoryLibraryVoIPage; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java index e89e84e..f1ea6c8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java @@ -41,6 +41,8 @@ public class CoscoCategoryLibraryVo implements Serializable { * 创建时间 */ private String createTime; + + private String createBy; /** * 有效期 */ @@ -80,4 +82,9 @@ public class CoscoCategoryLibraryVo implements Serializable { private Date startTime; private Date endTime; + + /** + * 申请建库部门id + */ + private String applyDeptId; } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml index a8320d5..a08aeda 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml @@ -205,6 +205,8 @@ + + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml index 9cc7f41..175f8de 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml @@ -297,6 +297,6 @@ and csb.name like concat('%',#{vo.supplierName},'%') ORDER BY - csq.term_of_validity ASC + csq.term_of_validity desc