From 3f4f8a2f213788156a7ffffc54375cec69934793 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 6 Aug 2025 10:57:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CoscoPortalsCustomerQandaMapper.xml | 3 +++ .../mapper/CoscoPortalsHelpcenterQandaMapper.xml | 3 +++ .../CoscoPortalsLinksClassificationMapper.xml | 11 ++++++----- .../dao/mapper/CoscoPortalsLinksMapper.xml | 5 +++-- .../CoscoPortalsHelpcenterQandaServiceImpl.java | 16 ++++++++++++++-- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsCustomerQandaMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsCustomerQandaMapper.xml index d189f14..c71dd17 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsCustomerQandaMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsCustomerQandaMapper.xml @@ -97,6 +97,9 @@ and answer_time = #{vo.answerTime} + + and create_by = #{vo.createBy} + and is_answer = 0 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsHelpcenterQandaMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsHelpcenterQandaMapper.xml index 42207c9..e65d8ae 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsHelpcenterQandaMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsHelpcenterQandaMapper.xml @@ -79,6 +79,9 @@ and type = #{vo.type} + + and create_by = #{vo.createBy} + and publish_by = #{vo.publishBy} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksClassificationMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksClassificationMapper.xml index 2106611..3fc9d8a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksClassificationMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksClassificationMapper.xml @@ -65,21 +65,22 @@ and del_flag = 'normal' - and vo.name like concat('%', #{name}, '%') + and name like concat('%', #{name}, '%') - and vo.type = #{type} + and type = #{type} - and vo.parent_id = #{parentId} + and parent_id = #{parentId} - and vo.order_by = #{orderBy} + and order_by = #{orderBy} - and vo.last_update_time = #{lastUpdateTime} + and last_update_time = #{lastUpdateTime} + order by order_by asc diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml index 5022928..f62dadf 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml @@ -92,6 +92,7 @@ and cpl.last_update_time = #{vo.lastUpdateTime} + order by cpl.order_by asc - select count(id) as totalCount, - count(case when status = '1' then 1 end) as publishCount + select count(id) as totalCount, + count(case when status = '1' then 1 end) as publishCount from cosco_portals_links where del_flag = 'normal' diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java index 043f31c..a906ac9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java @@ -2,12 +2,14 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.client.SystemClient; 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.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; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant; -import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant; import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsHelpcenterQandaMapper; import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsCustomerQanda; import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsHelpcenterQanda; @@ -28,6 +30,8 @@ import java.util.List; public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl implements ICoscoPortalsHelpcenterQandaService { @Autowired private CoscoPortalsHelpcenterQandaMapper coscoPortalsHelpcenterQandaMapper; + @Autowired + private SystemClient systemClient; /** * 查询中远门户_帮助中心_问答 @@ -125,7 +129,15 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl getPage(CoscoPortalsHelpcenterQanda coscoPortalsHelpcenterQanda) { IPage p = new Page<>(coscoPortalsHelpcenterQanda.getBasePageRequest().getPageNo(), coscoPortalsHelpcenterQanda.getBasePageRequest().getPageSize()); - return coscoPortalsHelpcenterQandaMapper.getPageList(p,coscoPortalsHelpcenterQanda); + IPage pageList = coscoPortalsHelpcenterQandaMapper.getPageList(p, coscoPortalsHelpcenterQanda); + pageList.getRecords().forEach(q -> { + BaseResponse user = + systemClient.getUser(q.getCreateBy()); + if(user!=null && user.getData()!=null){ + q.setCreateBy(user.getData().getName()); + } + }); + return pageList; } @Override From 0b0fd02f23e7e39bbc1c336035b990df87ebb67f Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 6 Aug 2025 13:34:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0fegin=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zyhy/ebtp/supplier/BizSupplierManageApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/BizSupplierManageApplication.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/BizSupplierManageApplication.java index 5e412d2..cc2dc04 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/BizSupplierManageApplication.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/BizSupplierManageApplication.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.ComponentScan; DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class }) -@EnableFeignClients +@EnableFeignClients({"com.chinaunicom.mall.ebtp.common","com.chinaunicom.zyhy.ebtp","com.chinaunicom.mall.ebtp.cloud"}) @ComponentScan({ "com.chinaunicom.mall.ebtp.common", "com.chinaunicom.mall.ebtp.core",