bug修改

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;

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);
 }

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转名称
+//     * 供应商id转名称
-     */
+//     */
-    String XZD_GYSXX_ID_TO_NAME = "gysxx_id_to_name";
+//    String XZD_KHXX_ID_TO_NAME = "gysxx_id_to_name";
 
     /**
      * 新中大项目id转名称

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<String> {
 
     private final XzdSupplierInfoService xzdSupplierInfoService;

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
 

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<XzdPurcha
     private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService;
 
 
-    @Autowired
+//    @Autowired
-    private XzdSupplierInfoServiceImpl xzdSupplierInfoService;
+//    private XzdSupplierInfoServiceImpl xzdSupplierInfoService;
 
 
     @Autowired

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java

@@ -132,7 +132,7 @@ public class XzdPurchaseContractAlterationVo 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;
 
 
@@ -152,7 +152,7 @@ public class XzdPurchaseContractAlterationVo 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;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java

@@ -130,7 +130,7 @@ public class XzdSubcontractVo 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;
 
 
@@ -144,7 +144,7 @@ public class XzdSubcontractVo 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;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java

@@ -120,7 +120,7 @@ public class XzdPurchaseContractInformationVo 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;
 
     /**
@@ -221,7 +221,7 @@ public class XzdPurchaseContractInformationVo 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;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java

@@ -111,7 +111,7 @@ public class XzdGuaranteeInfoVo implements Serializable {
      * 申请机构名称
      */
     @ExcelProperty(value = "申请机构名称")
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationOrganization")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "applicationOrganization")
     private String applicationOrganizationName;
 
     /**
@@ -131,7 +131,7 @@ public class XzdGuaranteeInfoVo implements Serializable {
      * 甲方单位名称
      */
     @ExcelProperty(value = "甲方单位名称")
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationOrganization")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "applicationOrganization")
     private String partyAUnitName;
 
     /**
@@ -144,7 +144,7 @@ public class XzdGuaranteeInfoVo implements Serializable {
      * 乙方单位名称
      */
     @ExcelProperty(value = "乙方单位名称")
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationOrganization")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "applicationOrganization")
     private String partyBUnitName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/domain/vo/XzdDepositApplicationVo.java

@@ -136,7 +136,7 @@ public class XzdDepositApplicationVo implements Serializable {
      * 收取保证金单位
      */
     @ExcelProperty(value = "收取保证金单位")
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "depositReceivingUnit")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "depositReceivingUnit")
     private String depositReceivingUnitName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/domain/vo/XzdFbhtzbjthVo.java

@@ -141,7 +141,7 @@ public class XzdFbhtzbjthVo implements Serializable {
      * 申请单位
      */
     @ExcelProperty(value = "申请单位")
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationUnit")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "applicationUnit")
     private String applicationUnitName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java

@@ -214,7 +214,7 @@ public class AppreciationInvoiceVo implements Serializable {
      * 购方名称
      */
     @ExcelProperty(value = "购方名称")
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "buyerName")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "buyerName")
     private String buyerNameS;
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/domain/vo/XzdSfkCaigouFkVo.java

@@ -124,7 +124,7 @@ public class XzdSfkCaigouFkVo extends BaseEntity {
     @ExcelProperty(value = "收款单位", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "带=*，必填")
     private Long receiptUnit;
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "receiptUnit")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "receiptUnit")
     private String receiptUnitName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/domain/vo/XzdSfkZonhefuwuFkVo.java

@@ -124,7 +124,7 @@ public class XzdSfkZonhefuwuFkVo extends BaseEntity {
     @ExcelProperty(value = "收款单位", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "带=*，必填")
     private Long receiptUnit;
-    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "receiptUnit")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "receiptUnit")
     private String receiptUnitName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java

@@ -1,7 +1,7 @@
 package org.dromara.xzd.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.dromara.common.core.domain.vo.XzdCustomerSuppliervo;
+import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos;
 import org.dromara.common.core.service.XzdCustomerSupplierService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -133,8 +133,8 @@ public class XzdCustomerSupplierServiceImpl extends ServiceImpl<XzdCustomerSuppl
     }
 
     @Override
-    public XzdCustomerSuppliervo queryByIdone(Long id) {
+    public XzdCustomerSupplierVos queryByIdone(Long id) {
         XzdCustomerSupplierVo xzdCustomerSupplierVo = baseMapper.selectVoById(id);
-        return MapstructUtils.convert(xzdCustomerSupplierVo, XzdCustomerSuppliervo.class);
+        return MapstructUtils.convert(xzdCustomerSupplierVo, XzdCustomerSupplierVos.class);
     }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java

@@ -3,7 +3,7 @@ package org.dromara.xzd.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.dromara.common.core.domain.vo.XzdCustomerSuppliervo;
+import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos;
 import org.dromara.common.core.service.XzdCustomerSupplierService;
 import org.dromara.common.core.service.XzdCustomerinformationService;
 import org.dromara.common.core.service.XzdSupplierInfoService;
@@ -189,7 +189,7 @@ public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerin
     public String selectNmaeByIds(String ids) {
         List<String> 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;
             }

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<XzdSupplierInfoMappe
     @Autowired
     private XzdSupplierOpenBankServiceImpl xzdSupplierOpenBankService;
 
-    private final XzdCustomerSupplierService xzdCustomerSupplierService;
 
     @Autowired
     private SysUserServiceImpl sysUserService;
     @Autowired
     private SysOssServiceImpl sysOssService;
 
-    private final XzdCustomerinformationService xzdCustomerinformationService;
 
 
     /**
@@ -900,28 +893,30 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
 
     @Override
     public String selectNmaeByIds(String ids) {
-        List<String> list = new ArrayList<>();
+//        List<String> list = new ArrayList<>();
-        for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
+//        for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
-            XzdCustomerSuppliervo xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id);
+//            XzdCustomerSupplierVos xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id);
-            if (xzdCustomerSuppliervo == null){
+//            if (xzdCustomerSuppliervo == null){
-                return null;
+//                return null;
-            }
+//            }
-            if (xzdCustomerSuppliervo.getType().equals("1")){
+//            if (xzdCustomerSuppliervo.getType().equals("1")){
-                String s = xzdCustomerinformationService.selectNmaeById(id);
+//                String s = xzdCustomerinformationService.selectNmaeById(id);
-                if (StringUtils.isNotBlank(s)){
+//                if (StringUtils.isNotBlank(s)){
-                    list.add(s);
+//                    list.add(s);
-                }
+//                }
-            }else {
+//            }else {
-                String s = this.selectNmaeById(id);
+//                String s = this.selectNmaeById(id);
-                if (StringUtils.isNotBlank(s)){
+//                if (StringUtils.isNotBlank(s)){
-                    list.add(s);
+//                    list.add(s);
-                }
+//                }
-
+//
-            }
+//            }
-        }
+//        }
-        return String.join(StringUtils.SEPARATOR, list);
+//        return String.join(StringUtils.SEPARATOR, list);
+        return null;
     }
 
+
     @Override
     public String selectNmaeById(Long id) {
         XzdSupplierInfoVo xzdSupplierInfoVo = this.baseMapper.selectVoById(Convert.toLong(id));

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;
 
     /**

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;
 
     /**

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;
 
 

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;
 
     /**

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;
 
     /**