From 590593a28bc2abb50f7e57d37ea16d98e2b6aa1b Mon Sep 17 00:00:00 2001 From: PQZ Date: Sat, 22 Nov 2025 11:42:05 +0800 Subject: [PATCH] 1111 --- .../ruoyi/base/service/IBaseCountryService.java | 8 ++++++++ .../service/impl/BaseCountryServiceImpl.java | 16 ++++++++++++++++ .../cus/service/impl/CusMainServiceImpl.java | 7 +++++++ .../main/java/com/ruoyi/cus/vo/CusViewVO.java | 2 ++ dl_vue/src/views/cus/main/viewForm.vue | 7 ++++++- 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCountryService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCountryService.java index 21f78e6..ad2e0f8 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCountryService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCountryService.java @@ -25,4 +25,12 @@ public interface IBaseCountryService extends IService { * @date 15:47 2025/11/17 **/ IPage queryListPage(BaseCountry pageReqVO, Page page); + /** + * 通过名称查询 + * @author PQZ + * @date 11:32 2025/11/22 + * @param nameCn 中文名称 + * @return com.ruoyi.base.domain.BaseCountry + **/ + BaseCountry queryByName(String nameCn); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCountryServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCountryServiceImpl.java index 652e3e2..e637e5f 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCountryServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCountryServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.base.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.base.vo.BaseCountryVO; @@ -36,4 +37,19 @@ public class BaseCountryServiceImpl extends ServiceImpl queryListPage(BaseCountry pageReqVO, Page page) { return baseCountryMapper.queryListPage(pageReqVO, page); } + + /** + * 通过名称查询 + * + * @param nameCn 中文名称 + * @return com.ruoyi.base.domain.BaseCountry + * @author PQZ + * @date 11:32 2025/11/22 + **/ + @Override + public BaseCountry queryByName(String nameCn) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BaseCountry::getNameCn,nameCn); + return this.getOne(lambdaQueryWrapper); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java index e931581..fe086e3 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.service.IBaseCountryService; import com.ruoyi.common.core.domain.DlBaseEntity; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; @@ -51,6 +52,8 @@ public class CusMainServiceImpl extends ServiceImpl impl private ICusMarkService cusMarkService; @Autowired private ICusTimeAxisService cusTimeAxisService; + @Autowired + private IBaseCountryService baseCountryService; @Override public IPage queryListPage(MainVO pageReqVO, Page page) { @@ -243,6 +246,10 @@ public class CusMainServiceImpl extends ServiceImpl impl List contacts = cusContactsService.list(new LambdaQueryWrapper().eq(CusContacts::getCusId, id) .orderByDesc(CusContacts::getIfDefault).orderByDesc(DlBaseEntity::getCreateTime)); contacts.forEach(item->item.setIdStr(item.getId().toString())); + //3.国旗信息 + if (StringUtils.isNotEmpty(cusMain.getCountry())){ + cusViewVO.setCountryImg(baseCountryService.queryByName(cusMain.getCountry()).getImg()); + } cusViewVO.setContacts(contacts); return cusViewVO; } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/CusViewVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/CusViewVO.java index 7b91df3..a62d47c 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/CusViewVO.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/CusViewVO.java @@ -20,6 +20,8 @@ public class CusViewVO { private CusCompany company; /** 管理信息 */ private CusManager manager; + /** 国旗信息*/ + private String countryImg; /** 银行信息 */ private List bankList; } diff --git a/dl_vue/src/views/cus/main/viewForm.vue b/dl_vue/src/views/cus/main/viewForm.vue index 45b4e94..7cb1ad1 100644 --- a/dl_vue/src/views/cus/main/viewForm.vue +++ b/dl_vue/src/views/cus/main/viewForm.vue @@ -20,7 +20,7 @@
- + {{mainInfo.cusMain.country}}
@@ -243,6 +243,11 @@ export default { } }, methods: { + + /** 获取国旗图标 */ + getImg(imgPath) { + return require(`@/assets/flags/${imgPath}`); + }, getMainInfo() { viewData({id:this.id}).then(res => { if(res.code==200){