diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSuppliervo.java b/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSupplierVos.java similarity index 90% rename from xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSuppliervo.java rename to xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSupplierVos.java index d1f53ddc..73d66f35 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSuppliervo.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSupplierVos.java @@ -6,7 +6,7 @@ import java.io.Serial; @Data -public class XzdCustomerSuppliervo { +public class XzdCustomerSupplierVos { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerSupplierService.java b/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerSupplierService.java index 85bf826f..612d38b3 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerSupplierService.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerSupplierService.java @@ -1,6 +1,6 @@ package org.dromara.common.core.service; -import org.dromara.common.core.domain.vo.XzdCustomerSuppliervo; +import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos; public interface XzdCustomerSupplierService { @@ -10,5 +10,5 @@ public interface XzdCustomerSupplierService { * @param id 主键 * @return 供应商-客户中间 */ - XzdCustomerSuppliervo queryByIdone(Long id); + XzdCustomerSupplierVos queryByIdone(Long id); } diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java index d75d22b3..8a0c81ef 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java @@ -44,10 +44,10 @@ public interface TransConstant { String XZD_KHXX_ID_TO_NAME = "khxx_id_to_name"; - /** - * 供应商id转名称 - */ - String XZD_GYSXX_ID_TO_NAME = "gysxx_id_to_name"; +// /** +// * 供应商id转名称 +// */ +// String XZD_KHXX_ID_TO_NAME = "gysxx_id_to_name"; /** * 新中大项目id转名称 diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSupplierInfoImpl.java b/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSupplierInfoImpl.java index 215c8064..3c0d99d1 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSupplierInfoImpl.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSupplierInfoImpl.java @@ -7,7 +7,7 @@ import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; @AllArgsConstructor -@TranslationType(type = TransConstant.XZD_GYSXX_ID_TO_NAME) +//@TranslationType(type = TransConstant.XZD_KHXX_ID_TO_NAME) public class XzdSupplierInfoImpl implements TranslationInterface { private final XzdSupplierInfoService xzdSupplierInfoService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java index 62ff8aa3..c3d06708 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java @@ -147,7 +147,7 @@ public class XzdBidPreProjectVo implements Serializable { /** * 联投单位 */ - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "jointInvestmentEntity") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "jointInvestmentEntity") private String jointInvestmentEntityName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java index e550590d..6f441387 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java @@ -184,7 +184,7 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 建设单位 */ @ExcelProperty(value = "建设单位") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "constructionUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "constructionUnit") private String constructionUnitName; /** @@ -208,7 +208,7 @@ public class XzdBqlxProjectInfoVo implements Serializable { * 招标单位 */ @ExcelProperty(value = "招标单位") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "biddingUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "biddingUnit") private String biddingUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java index 9c18fa7f..454ab84a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java @@ -86,7 +86,7 @@ public class XzdBiddingFileEstimateVo implements Serializable { * 招标单位 */ @ExcelProperty(value = "招标单位") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "biddingUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "biddingUnit") private String biddingUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java index 103ce673..76a1640c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java @@ -123,7 +123,7 @@ public class XzdCsContractChangeVo implements Serializable { */ @ExcelProperty(value = "乙方单位") private Long partyB; - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyB") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyB") private String partyBName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java index c965fcd5..689e0c3b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java @@ -115,7 +115,7 @@ public class XzdCsContractInformationVo implements Serializable { */ @ExcelProperty(value = "乙方单位") private Long partyB; - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyB") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyB") private String partyBName; /** @@ -151,7 +151,7 @@ public class XzdCsContractInformationVo implements Serializable { */ @ExcelProperty(value = "开票单位") private Long invoiceIssuer; - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "invoiceIssuer") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoiceIssuer") private String invoiceIssuerName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractSuspendVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractSuspendVo.java index f54ea719..96ea5370 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractSuspendVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractSuspendVo.java @@ -90,7 +90,7 @@ public class XzdCsContractSuspendVo implements Serializable { */ @ExcelProperty(value = "乙方单位") private Long artyBUnit; - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "artyBUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "artyBUnit") private String artyBUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/vo/XzdPurchaseContractSuspendVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/vo/XzdPurchaseContractSuspendVo.java index ef022010..a6d50abd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/vo/XzdPurchaseContractSuspendVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/vo/XzdPurchaseContractSuspendVo.java @@ -100,7 +100,7 @@ public class XzdPurchaseContractSuspendVo implements Serializable { * 乙方单位名称 */ @ExcelProperty(value = "乙方单位名称") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "artyBUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "artyBUnit") private String artyBUnitName; /** @@ -113,7 +113,7 @@ public class XzdPurchaseContractSuspendVo implements Serializable { * 甲方单位名称 */ @ExcelProperty(value = "甲方单位名称") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyAUnit") private String partyAUnitName; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java index cf4e7be3..bef7e548 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java @@ -55,8 +55,8 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl list = new ArrayList<>(); for (Long id : StringUtils.splitTo(ids, Convert::toLong)) { - XzdCustomerSuppliervo xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id); + XzdCustomerSupplierVos xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id); if (xzdCustomerSuppliervo == null){ return null; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java index 148c81fd..bb447913 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java @@ -1,18 +1,13 @@ package org.dromara.xzd.service.impl; import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.vo.XzdCustomerSuppliervo; -import org.dromara.common.core.service.XzdCustomerSupplierService; -import org.dromara.common.core.service.XzdCustomerinformationService; import org.dromara.common.core.service.XzdSupplierInfoService; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -76,14 +71,12 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl list = new ArrayList<>(); - for (Long id : StringUtils.splitTo(ids, Convert::toLong)) { - XzdCustomerSuppliervo xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id); - if (xzdCustomerSuppliervo == null){ - return null; - } - if (xzdCustomerSuppliervo.getType().equals("1")){ - String s = xzdCustomerinformationService.selectNmaeById(id); - if (StringUtils.isNotBlank(s)){ - list.add(s); - } - }else { - String s = this.selectNmaeById(id); - if (StringUtils.isNotBlank(s)){ - list.add(s); - } - - } - } - return String.join(StringUtils.SEPARATOR, list); +// List list = new ArrayList<>(); +// for (Long id : StringUtils.splitTo(ids, Convert::toLong)) { +// XzdCustomerSupplierVos xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id); +// if (xzdCustomerSuppliervo == null){ +// return null; +// } +// if (xzdCustomerSuppliervo.getType().equals("1")){ +// String s = xzdCustomerinformationService.selectNmaeById(id); +// if (StringUtils.isNotBlank(s)){ +// list.add(s); +// } +// }else { +// String s = this.selectNmaeById(id); +// if (StringUtils.isNotBlank(s)){ +// list.add(s); +// } +// +// } +// } +// return String.join(StringUtils.SEPARATOR, list); + return null; } + @Override public String selectNmaeById(Long id) { XzdSupplierInfoVo xzdSupplierInfoVo = this.baseMapper.selectVoById(Convert.toLong(id)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java index e9d449de..0a1b048d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java @@ -142,7 +142,7 @@ public class XzdJsCgJungonVo implements Serializable { */ @ExcelProperty(value = "乙方单位") private Long partyB; - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyB") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyB") private String partyBName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/vo/SettlementOfSubcontractingContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/vo/SettlementOfSubcontractingContractVo.java index 9db191e5..ebf711da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/vo/SettlementOfSubcontractingContractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/vo/SettlementOfSubcontractingContractVo.java @@ -131,7 +131,7 @@ public class SettlementOfSubcontractingContractVo implements Serializable { * 结算单位 客户信息名称 */ @ExcelProperty(value = "结算单位 客户信息名称") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "settlementUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "settlementUnit") private String settlementUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/vo/SettlementOfSubcontractingCompletionVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/vo/SettlementOfSubcontractingCompletionVo.java index a853d97f..ba7e6fe0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/vo/SettlementOfSubcontractingCompletionVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/vo/SettlementOfSubcontractingCompletionVo.java @@ -121,7 +121,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 甲方单位名称 */ @ExcelProperty(value = "甲方单位名称") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyAUnit") private String partyAUnitName; @@ -135,7 +135,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 乙方单位名称 */ @ExcelProperty(value = "乙方单位名称") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyBUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyBUnit") private String partyBUnitName; /** @@ -215,7 +215,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 业主单位名称 客户 */ @ExcelProperty(value = "业主单位名称 客户") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "ownerUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "ownerUnit") private String ownerUnitName; /** @@ -228,7 +228,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 监理单位名称 客户 */ @ExcelProperty(value = "监理单位名称 客户") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "supervisionUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "supervisionUnit") private String supervisionUnitName; /** @@ -241,7 +241,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 施工单位名称 客户 */ @ExcelProperty(value = "施工单位名称 客户") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "constructionUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "constructionUnit") private String constructionUnitName; /** @@ -254,7 +254,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 审核单位名称 客户 */ @ExcelProperty(value = "审核单位名称 客户") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "auditUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "auditUnit") private String auditUnitName; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/DetailOfEarningsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/DetailOfEarningsVo.java index b31b1c70..a63cfa00 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/DetailOfEarningsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/DetailOfEarningsVo.java @@ -109,7 +109,7 @@ public class DetailOfEarningsVo implements Serializable { * 甲方单位名称 客户 */ @ExcelProperty(value = "甲方单位名称 客户") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyAUnit") private String partyAUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/StatementOfExpendituresVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/StatementOfExpendituresVo.java index 486a01ff..7368ba00 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/StatementOfExpendituresVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/StatementOfExpendituresVo.java @@ -102,7 +102,7 @@ public class StatementOfExpendituresVo implements Serializable { * 供应商名称 */ @ExcelProperty(value = "供应商名称") - @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "supplier") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "supplier") private String supplierName; /**