This commit is contained in:
PQZ 2025-11-22 11:42:05 +08:00
parent edc60f9713
commit 590593a28b
5 changed files with 39 additions and 1 deletions

View File

@ -25,4 +25,12 @@ public interface IBaseCountryService extends IService<BaseCountry> {
* @date 15:47 2025/11/17
**/
IPage<BaseCountryVO> queryListPage(BaseCountry pageReqVO, Page<BaseCountry> page);
/**
* 通过名称查询
* @author PQZ
* @date 11:32 2025/11/22
* @param nameCn 中文名称
* @return com.ruoyi.base.domain.BaseCountry
**/
BaseCountry queryByName(String nameCn);
}

View File

@ -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<BaseCountryMapper, BaseC
public IPage<BaseCountryVO> queryListPage(BaseCountry pageReqVO, Page<BaseCountry> 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<BaseCountry> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(BaseCountry::getNameCn,nameCn);
return this.getOne(lambdaQueryWrapper);
}
}

View File

@ -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<CusMainMapper,CusMain> impl
private ICusMarkService cusMarkService;
@Autowired
private ICusTimeAxisService cusTimeAxisService;
@Autowired
private IBaseCountryService baseCountryService;
@Override
public IPage<MainVO> queryListPage(MainVO pageReqVO, Page<CusMain> page) {
@ -243,6 +246,10 @@ public class CusMainServiceImpl extends ServiceImpl<CusMainMapper,CusMain> impl
List<CusContacts> contacts = cusContactsService.list(new LambdaQueryWrapper<CusContacts>().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;
}

View File

@ -20,6 +20,8 @@ public class CusViewVO {
private CusCompany company;
/** 管理信息 */
private CusManager manager;
/** 国旗信息*/
private String countryImg;
/** 银行信息 */
private List<CusBank> bankList;
}

View File

@ -20,7 +20,7 @@
<i class="el-icon-copy-document dl-canclick" title="复制"></i>
<el-divider direction="vertical"></el-divider>
<div class="country-container">
<img class="country-flag" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAIAAAD5gJpuAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHzSURBVHjaYkxOP8IAB//+Mfz7w8Dwi4HhP5CcJb/n/7evb16/APL/gRFQDiAAw3JuAgAIBEDQ/iswEERjGzBQLEru97ll0g0+3HvqMn1SpqlqGsZMsZsIe0SICA5gt5a/AGIEarCPtFh+6N/ffwxA9OvP/7//QYwff/6fZahmePeB4dNHhi+fGb59Y4zyvHHmCEAAAW3YDzQYaJJ93a+vX79aVf58//69fvEPlpIfnz59+vDhw7t37968efP3b/SXL59OnjwIEEAsDP+YgY53b2b89++/awvLn98MDi2cVxl+/vl6mituCtBghi9f/v/48e/XL86krj9XzwEEEENy8g6gu22rfn78+NGs5Ofr16+ZC58+fvyYwX8rxOxXr169fPny+fPn1//93bJlBUAAsQADZMEBxj9/GBxb2P/9+S/R8u3vzxuyaX8ZHv3j8/YGms3w8ycQARmi2eE37t4ACCDGR4/uSkrKAS35B3TT////wADOgLOBIaXIyjBlwxKAAGKRXjCB0SOEaeu+/y9fMnz4AHQxCP348R/o+l+//sMZQBNLEvif3AcIIMZbty7Ly6t9ZmXl+fXj/38GoHH/UcGfP79//BBiYHjy9+8/oUkNAAHEwt1V/vI/KBY/QSISFqM/GBg+MzB8A6PfYC5EFiDAABqgW776MP0rAAAAAElFTkSuQmCC"/>
<img v-if="mainInfo.countryImg != null" :src="getImg(mainInfo.countryImg)" style="width: 30px; height: 20px;"/>
<span class="country-name">{{mainInfo.cusMain.country}}</span>
</div>
<el-divider direction="vertical"></el-divider>
@ -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){