From d494bcac93a2f6506281c8aa923f422274ccff4f Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Thu, 17 Jul 2025 15:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoscoCategoryLibrarySupplierApplyServiceImpl.java | 5 +++++ .../vo/ListCoscoCategoryLibrarySupplierApplyVo.java | 6 +++++- .../dao/mapper/CoscoCategoryLibraryMapper.xml | 11 ++++++----- .../CoscoCategoryLibrarySupplierApplyMapper.xml | 3 ++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java index 9abbbae..9886894 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.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; @@ -183,6 +184,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp listCoscoCategoryLibrarySupplierApplyVoIPage.getRecords().forEach(vo -> { OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId()); vo.setDeptName(orgDeptInfo.getOrgName()); + SysUser userById = userService.getUserById(vo.getCreateBy()); + if(userById!=null){ + vo.setApplyUser(userById.getName()); + } }); return listCoscoCategoryLibrarySupplierApplyVoIPage; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java index 0463913..6c13de3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java @@ -21,7 +21,11 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable { /** * 部门名称 */ - private String deptName="部门"; + private String deptName; + /** + * 申请人id + */ + private String createBy; /** * 部门id */ 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 a08aeda..0859e1e 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 @@ -214,7 +214,7 @@ ccl.id, ccl.name, GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames, - ccl.area, + max(dp.dic_name) AS area, ccl.create_by, ccl.apply_dept_id, ccl.term_of_validity AS termOfValidity, @@ -232,7 +232,7 @@ WHEN ccl.approve_status = 1 THEN '通过' WHEN ccl.approve_status = 2 THEN '驳回' END AS approveResult, - COUNT(DISTINCT cclsa.id) AS snumber + COUNT(DISTINCT ccls.id) AS snumber FROM cosco_category_library ccl LEFT JOIN @@ -240,10 +240,11 @@ LEFT JOIN cosco_category cc ON cc.id = cclc.category_id and cc.type=1 LEFT JOIN - cosco_category_library_supplier ccls ON ccl.id = ccls.category_library_id + cosco_category_library_supplier_apply cclsa ON cclsa.category_library_id = ccl.id AND cclsa.approve_status = 1 LEFT JOIN - cosco_category_library_supplier_apply cclsa ON ccls.category_library_supplier_apply_id = cclsa.id - AND cclsa.approve_status = 1 + cosco_category_library_supplier ccls ON cclsa.id = ccls.category_library_supplier_apply_id + left join dict_project dp on ccl.area = dp.code and dp.parent_code='area' + and ccl.del_flag = 'normal' diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml index 26903e3..a88aa79 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml @@ -184,7 +184,7 @@