From e73c808bc3d50719f67d120c758d919bd0db6281 Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 25 Oct 2025 17:21:16 +0800 Subject: [PATCH] =?UTF-8?q?xzd=E5=89=8D=E7=BC=80=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzdBidPreProjectController.java | 2 +- .../XzdBiddingFileEstimateController.java | 2 +- .../domain/vo/XzdBiddingFileEstimateVo.java | 7 ++ .../XzdBiddingDocumentController.java | 2 +- .../domain/vo/XzdBiddingDocumentVo.java | 8 +++ .../XzdBidDepositPaymentController.java | 2 +- .../XzdBidDepositRecoveryController.java | 2 +- .../XzdBiddingAgencyFeePaymentController.java | 2 +- .../XzdPostBidAnalysisController.java | 2 +- .../XzdCsContractChangeController.java | 2 +- .../XzdCsContractInformationController.java | 2 +- .../XzdCsContractSuspendController.java | 2 +- .../XzdPurchaseContractSuspendController.java | 2 +- .../vo/XzdPurchaseContractSuspendVo.java | 2 + ...XzdPurchaseContractSuspendServiceImpl.java | 21 ------ ...dPurchaseContractAlterationController.java | 2 +- .../vo/XzdPurchaseContractAlterationVo.java | 2 + ...PurchaseContractAlterationServiceImpl.java | 15 +--- .../XzdSubcontractChangeController.java | 2 +- .../impl/XzdSubcontractChangeServiceImpl.java | 1 + .../controller/XzdSubcontractController.java | 2 +- .../domain/vo/XzdSubcontractVo.java | 6 ++ .../impl/XzdSubcontractServiceImpl.java | 38 ----------- .../XzdSubcontractTerminationController.java | 2 +- ...PurchaseContractInformationController.java | 2 +- .../vo/XzdPurchaseContractInformationVo.java | 9 +++ ...urchaseContractInformationServiceImpl.java | 68 ------------------- .../controller/XzdCbysJdcbfjController.java | 2 +- .../controller/XzdCbysWgcbtbController.java | 2 +- .../XzdCbysZjhcbAlterationController.java | 2 +- .../controller/XzdCbysZjhcbController.java | 2 +- .../XzdGuaranteeChangeInfoController.java | 2 +- .../XzdGuaranteeInfoController.java | 2 +- .../domain/vo/XzdGuaranteeInfoVo.java | 5 ++ .../impl/XzdGuaranteeInfoServiceImpl.java | 4 +- .../XzdDepositApplicationController.java | 2 +- .../controller/XzdFbhtzbjthController.java | 2 +- .../AppreciationInvoiceController.java | 2 +- .../domain/vo/AppreciationInvoiceVo.java | 2 + .../impl/AppreciationInvoiceServiceImpl.java | 14 ---- .../controller/XzdSfkCaigouFkController.java | 2 +- .../XzdSfkZonhefuwuFkController.java | 2 +- .../controller/XzdJsCgJinduController.java | 2 +- .../controller/XzdJsCgJungonController.java | 2 +- .../XzdJsCgJungonEditController.java | 2 +- .../controller/XzdJsZhfwJinduController.java | 2 +- ...entOfSubcontractingContractController.java | 2 +- .../SettlementOfSubcontractingContractVo.java | 4 ++ ...ntOfSubcontractingContractServiceImpl.java | 15 +--- ...tOfSubcontractingCompletionController.java | 2 +- ...ettlementOfSubcontractingCompletionVo.java | 9 +++ ...OfSubcontractingCompletionServiceImpl.java | 53 --------------- ...tOfSubcontractingAdjustmentController.java | 2 +- ...ancialRevenuePlanAlterationController.java | 2 +- .../vo/FinancialRevenuePlanAlterationVo.java | 1 + ...ncialRevenuePlanAlterationServiceImpl.java | 19 ------ ...ncialRevenueExpenditurePlanController.java | 2 +- .../domain/vo/DetailOfEarningsVo.java | 4 ++ .../vo/FinancialRevenueExpenditurePlanVo.java | 1 + .../domain/vo/StatementOfExpendituresVo.java | 4 ++ ...cialRevenueExpenditurePlanServiceImpl.java | 19 ------ 61 files changed, 105 insertions(+), 298 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdBidPreProjectController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdBidPreProjectController.java index fa6248b4..57bf95df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdBidPreProjectController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdBidPreProjectController.java @@ -35,7 +35,7 @@ import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProje @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/biddingManagement/bidPreProject") +@RequestMapping("/xzd/biddingManagement/bidPreProject") public class XzdBidPreProjectController extends BaseController { private final IXzdBidPreProjectService xzdBidPreProjectService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java index 99c97a00..0b383a03 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/biddingDocument/biddingFileEstimate") +@RequestMapping("/xzd/biddingDocument/biddingFileEstimate") public class XzdBiddingFileEstimateController extends BaseController { private final IXzdBiddingFileEstimateService xzdBiddingFileEstimateService; 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 8be871c6..9c18fa7f 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 @@ -82,6 +82,13 @@ public class XzdBiddingFileEstimateVo implements Serializable { @ExcelProperty(value = "招标单位") private String biddingUnit; + /** + * 招标单位 + */ + @ExcelProperty(value = "招标单位") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "biddingUnit") + private String biddingUnitName; + /** * 招标方式 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdBiddingDocumentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdBiddingDocumentController.java index ecd40c8c..63291b9c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdBiddingDocumentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdBiddingDocumentController.java @@ -34,7 +34,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/biddingDocument/biddingDocument") +@RequestMapping("/xzd/biddingDocument/biddingDocument") public class XzdBiddingDocumentController extends BaseController { private final IXzdBiddingDocumentService xzdBiddingDocumentService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java index f39d20bf..e0bbe98a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java @@ -80,6 +80,14 @@ public class XzdBiddingDocumentVo implements Serializable { @ExcelProperty(value = "投标单位") private String bidUnit; + /** + * 投标单位 + */ + @ExcelProperty(value = "投标单位") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "bidUnit") + private String bidUnitName; + + /** * 单据日期 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java index 6c652157..64c80752 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java @@ -33,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/earnestMoney/bidDepositPayment") +@RequestMapping("/xzd/earnestMoney/bidDepositPayment") public class XzdBidDepositPaymentController extends BaseController { private final IXzdBidDepositPaymentService xzdBidDepositPaymentService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java index 8fa4c8a8..dbf10052 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java @@ -33,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/biddingManagement/bidDepositRecovery") +@RequestMapping("/xzd/biddingManagement/bidDepositRecovery") public class XzdBidDepositRecoveryController extends BaseController { private final IXzdBidDepositRecoveryService xzdBidDepositRecoveryService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java index fa8748b5..3a3ddddb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/paymentapplication/biddingAgencyFeePayment") +@RequestMapping("/xzd/paymentapplication/biddingAgencyFeePayment") public class XzdBiddingAgencyFeePaymentController extends BaseController { private final IXzdBiddingAgencyFeePaymentService xzdBiddingAgencyFeePaymentService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/controller/XzdPostBidAnalysisController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/controller/XzdPostBidAnalysisController.java index 6f0a8e22..49b57f32 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/controller/XzdPostBidAnalysisController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/controller/XzdPostBidAnalysisController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/postAnalysis/postBidAnalysis") +@RequestMapping("/xzd/postAnalysis/postBidAnalysis") public class XzdPostBidAnalysisController extends BaseController { private final IXzdPostBidAnalysisService xzdPostBidAnalysisService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java index 66be22e9..201c52df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/comprehensive/csContractChange") +@RequestMapping("/xzd/comprehensive/csContractChange") public class XzdCsContractChangeController extends BaseController { private final IXzdCsContractChangeService xzdCsContractChangeService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java index fd99584e..718db21b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/comprehensive/csContractInformation") +@RequestMapping("/xzd/comprehensive/csContractInformation") public class XzdCsContractInformationController extends BaseController { private final IXzdCsContractInformationService xzdCsContractInformationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java index b6f7c482..07dc1625 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/comprehensive/csContractSuspend") +@RequestMapping("/xzd/comprehensive/csContractSuspend") public class XzdCsContractSuspendController extends BaseController { private final IXzdCsContractSuspendService xzdCsContractSuspendService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java index f72c3736..b11e2d30 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/contractTermination/purchaseContractSuspend") +@RequestMapping("/xzd/contractTermination/purchaseContractSuspend") public class XzdPurchaseContractSuspendController extends BaseController { private final IXzdPurchaseContractSuspendService xzdPurchaseContractSuspendService; 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 dd8fbdc2..ef022010 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,6 +100,7 @@ public class XzdPurchaseContractSuspendVo implements Serializable { * 乙方单位名称 */ @ExcelProperty(value = "乙方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "artyBUnit") private String artyBUnitName; /** @@ -112,6 +113,7 @@ public class XzdPurchaseContractSuspendVo implements Serializable { * 甲方单位名称 */ @ExcelProperty(value = "甲方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_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 bffa7a32..cf4e7be3 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 @@ -83,27 +83,6 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl res) { for (XzdPurchaseContractSuspendVo item : res) { -// //项目名称 -// if (item.getProject() != null){ -// String projectName = xzdProjectService.queryNameById(item.getProject()); -// if (projectName != null){ -// item.setProjectName(projectName); -// } -// } - //甲方单位(客户信息列表) - R byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } - //乙方单位(供应商信息列表) - if (item.getArtyBUnit() != null){ - String unitName = xzdSupplierInfoService.queryNameById(item.getArtyBUnit()); - if (unitName != null){ - item.setArtyBUnitName(unitName); - } - } // 采购合同信息编码 if (item.getContractInformationId() != null){ XzdPurchaseContractInformationVo queryById = xzdPurchaseContractInformationService.queryById(item.getContractInformationId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java index 38f06969..0a34d967 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/hetongbiangeng/purchaseContractAlteration") +@RequestMapping("/xzd/hetongbiangeng/purchaseContractAlteration") public class XzdPurchaseContractAlterationController extends BaseController { private final IXzdPurchaseContractAlterationService xzdPurchaseContractAlterationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java index 58ede35f..5d22e887 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java @@ -132,6 +132,7 @@ public class XzdPurchaseContractAlterationVo implements Serializable { * 甲方单位 */ @ExcelProperty(value = "甲方单位") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit") private String partyAUnitName; @@ -151,6 +152,7 @@ public class XzdPurchaseContractAlterationVo implements Serializable { * 乙方单位 */ @ExcelProperty(value = "乙方单位") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "artyBUnit") private String artyBUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java index 5eafee53..066ffa89 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java @@ -97,20 +97,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } - //乙方单位(供应商信息列表) - if (item.getArtyBUnit() != null){ - String unitName = xzdSupplierInfoService.queryNameById(item.getArtyBUnit()); - if (unitName != null){ - item.setArtyBUnitName(unitName); - } - } + // 合同编码 if (item.getContractInformationId() != null){ XzdPurchaseContractInformationVo vo = iXzdPurchaseContractInformationService.queryById(item.getContractInformationId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java index 1254a5dd..a3e13e45 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fenbaohetongbiangg/subcontractChange") +@RequestMapping("/xzd/fenbaohetongbiangg/subcontractChange") public class XzdSubcontractChangeController extends BaseController { private final IXzdSubcontractChangeService xzdSubcontractChangeService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java index 3d5b751a..da3166d7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java @@ -169,6 +169,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl infos) { for (XzdSubcontractVo item : infos) { - //项目名称 - if (item.getProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getProject()); - if (projectName != null){ - item.setProjectName(projectName); - } - } - //甲方单位(客户信息列表) - R byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } - //乙方单位(供应商信息列表) - if (item.getPartyBUnit() != null){ - String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit()); - if (unitName != null){ - item.setPartyBUnitName(unitName); - } - } - //管理组织(供应商) - String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit()); - if (unitName != null){ - item.setManagementOrganizationName(unitName); - } - //开票单位名称 - R byidtemp = iXzdCorrespondentList.getCustomerByid((item.getInvoicingUnit())); - if (byidtemp!=null){ - if (byidtemp.getData().getXzdCustomerinformation() != null){ - item.setInvoicingUnitName(byidtemp.getData().getXzdCustomerinformation().getUnitName()); - } - } - //收票单位名称(供应商名称) - String unitName2 = xzdSupplierInfoService.queryNameById(item.getTicketReceivingUnit()); - if (unitName2 != null){ - item.setTicketReceivingUnitName(unitName2); - } // //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java index a3f3a3eb..1987c541 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fenbaohetongzhongzhi/subcontractTermination") +@RequestMapping("/xzd/fenbaohetongzhongzhi/subcontractTermination") public class XzdSubcontractTerminationController extends BaseController { private final IXzdSubcontractTerminationService xzdSubcontractTerminationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java index fab63c7f..dc5af076 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/contractManagement/purchaseContractInformation") +@RequestMapping("/xzd/contractManagement/purchaseContractInformation") public class XzdPurchaseContractInformationController extends BaseController { private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index 0adba091..c669840a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -88,6 +88,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目名称") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project") private String projectName; @@ -119,6 +120,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 甲方单位名称 */ @ExcelProperty(value = "甲方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit") private String partyAUnitName; /** @@ -169,6 +171,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 开票单位名称 */ @ExcelProperty(value = "开票单位名称", converter = ExcelDictConvert.class) + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoiceIssuingUnit") private String invoiceIssuingUnitName; /** @@ -182,6 +185,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 收票单位名称 */ @ExcelProperty(value = "收票单位名称", converter = ExcelDictConvert.class) + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoiceReceivingUnit") private String invoiceReceivingUnitName; /** @@ -217,6 +221,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 乙方单位名称 */ @ExcelProperty(value = "乙方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyBUnit") private String partyBUnitName; /** @@ -242,6 +247,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 其他收入合同项目名称 */ @ExcelProperty(value = "其他收入合同项目名称") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "otherIncomeContractProject") private String otherIncomeContractProjectName; /** @@ -272,6 +278,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 签约组织名称 */ @ExcelProperty(value = "签约组织名称") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "signingOrganization") private String signingOrganizationName; /** @@ -296,6 +303,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 丙方单位名称 */ @ExcelProperty(value = "丙方单位名称") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyCUnit") private String partyCUnitName; @@ -322,6 +330,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 关联主合同 */ @ExcelProperty(value = "关联主合同") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "associatedMainContract") private String associatedMainContractName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index 00369c9f..539a131d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -406,74 +406,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl infos){ for (XzdPurchaseContractInformationVo item : infos) { - - - //项目名称 - if (item.getProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getProject()); - if (projectName != null){ - item.setProjectName(projectName); - } - } - - //其他项目名称 - if (item.getProject() != null){ - if (StringUtils.isNotEmpty(item.getAssociatedMainContract())){ - String projectName = xzdProjectService.queryNameById(Long.parseLong(item.getAssociatedMainContract())); - if (projectName != null){ - item.setAssociatedMainContractName(projectName); - } - } - - } - //其他收入合同项目名称 - if (item.getOtherIncomeContractProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getOtherIncomeContractProject()); - if (projectName != null){ - item.setOtherIncomeContractProjectName(projectName); - } - } - //甲方单位(客户信息列表) - R byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } - //乙方单位(供应商信息列表) - if (item.getPartyBUnit() != null){ - String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit()); - if (unitName != null){ - item.setPartyBUnitName(unitName); - } - } -// //管理组织 -// String unitName = xzdSupplierInfoService.queryNameById(item.getManagementOrganization()); -// -// if (unitName != null){ -// item.setManagementOrganizationName(unitName); -// } - //开票单位名称(供应商名称) - String unitName1 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit()); - if (unitName1 != null){ - item.setInvoiceIssuingUnitName(unitName1); - } - //收票单位名称 - String unitNametemp = xzdSupplierInfoService.queryNameById(item.getInvoiceReceivingUnit()); - if (unitNametemp!=null){ - item.setInvoiceReceivingUnitName(unitNametemp); - } - //签约组织(供应商) - String unitName2 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit()); - if (unitName2!= null){ - item.setSigningOrganizationName(unitName2); - } - //丙方单位(供应商) - String unitName3 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit()); - - if (unitName3!= null){ - item.setPartyCUnitName(unitName3); - } //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java index 171254b7..8f5414bb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/costBudget/cbysJdcbfj") +@RequestMapping("/xzd/costBudget/cbysJdcbfj") public class XzdCbysJdcbfjController extends BaseController { private final IXzdCbysJdcbfjService xzdCbysJdcbfjService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbController.java index 084338cf..5ea8161f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/costBudget/cbysWgcbtb") +@RequestMapping("/xzd/costBudget/cbysWgcbtb") public class XzdCbysWgcbtbController extends BaseController { private final IXzdCbysWgcbtbService xzdCbysWgcbtbService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java index 9927d295..bf282860 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/costBudget/cbysZjhcbAlteration") +@RequestMapping("/xzd/costBudget/cbysZjhcbAlteration") public class XzdCbysZjhcbAlterationController extends BaseController { private final IXzdCbysZjhcbAlterationService xzdCbysZjhcbAlterationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbController.java index 97725212..9ca16e78 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/costBudget/cbysZjhcb") +@RequestMapping("/xzd/costBudget/cbysZjhcb") public class XzdCbysZjhcbController extends BaseController { private final IXzdCbysZjhcbService xzdCbysZjhcbService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java index 5b5aef8a..e8ab760d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/backletter/guaranteeChangeInfo") +@RequestMapping("/xzd/backletter/guaranteeChangeInfo") public class XzdGuaranteeChangeInfoController extends BaseController { private final IXzdGuaranteeChangeInfoService xzdGuaranteeChangeInfoService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java index a22b3f50..a7cfe578 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/deposit/guaranteeInfo") +@RequestMapping("/xzd/deposit/guaranteeInfo") public class XzdGuaranteeInfoController extends BaseController { private final IXzdGuaranteeInfoService xzdGuaranteeInfoService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java index e9bda5a7..0da406b1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java @@ -11,6 +11,8 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.deposit.contractBackletter.domain.XzdGuaranteeInfo; import java.io.Serial; @@ -109,6 +111,7 @@ public class XzdGuaranteeInfoVo implements Serializable { * 申请机构名称 */ @ExcelProperty(value = "申请机构名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationOrganization") private String applicationOrganizationName; /** @@ -128,6 +131,7 @@ public class XzdGuaranteeInfoVo implements Serializable { * 甲方单位名称 */ @ExcelProperty(value = "甲方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationOrganization") private String partyAUnitName; /** @@ -140,6 +144,7 @@ public class XzdGuaranteeInfoVo implements Serializable { * 乙方单位名称 */ @ExcelProperty(value = "乙方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationOrganization") private String partyBUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java index 15f5de48..f865f3a3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java @@ -72,7 +72,7 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl xzdGuaranteeInfoVo1 = List.of(xzdGuaranteeInfoVo); // 装填数据 - setValue(xzdGuaranteeInfoVo1); +// setValue(xzdGuaranteeInfoVo1); return xzdGuaranteeInfoVo1.getFirst(); @@ -113,7 +113,7 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - setValue(result.getRecords()); +// setValue(result.getRecords()); return TableDataInfo.build(result); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java index 4f233be7..92757287 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/earnestMoney/depositApplication") +@RequestMapping("/xzd/earnestMoney/depositApplication") public class XzdDepositApplicationController extends BaseController { private final IXzdDepositApplicationService xzdDepositApplicationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java index 7b8f06b0..4b394dc9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/refundDeposit/fbhtzbjth") +@RequestMapping("/xzd/refundDeposit/fbhtzbjth") public class XzdFbhtzbjthController extends BaseController { private final IXzdFbhtzbjthService xzdFbhtzbjthService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java index 278d0882..97ef5093 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/zengzhishui/invoice") +@RequestMapping("/xzd/zengzhishui/invoice") public class AppreciationInvoiceController extends BaseController { private final IAppreciationInvoiceService appreciationInvoiceService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java index 784c9dca..0878ad59 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java @@ -60,6 +60,7 @@ public class AppreciationInvoiceVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目名称") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project") private String projectName; /** @@ -213,6 +214,7 @@ public class AppreciationInvoiceVo implements Serializable { * 购方名称 */ @ExcelProperty(value = "购方名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "buyerName") private String buyerNameS; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java index 2744dee2..46623690 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java @@ -104,13 +104,6 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl byid = iXzdCorrespondentList.getCustomerByid(item.getBuyerName()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setBuyerNameS(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java index 73d6eaf6..6f364ef6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/paymentsReceipts/sfkCaigouFk") +@RequestMapping("/xzd/paymentsReceipts/sfkCaigouFk") public class XzdSfkCaigouFkController extends BaseController { private final IXzdSfkCaigouFkService xzdSfkCaigouFkService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java index ad00cc34..15d91919 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/paymentsReceipts/sfkZonhefuwuFk") +@RequestMapping("/xzd/paymentsReceipts/sfkZonhefuwuFk") public class XzdSfkZonhefuwuFkController extends BaseController { private final IXzdSfkZonhefuwuFkService xzdSfkZonhefuwuFkService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java index 54335a28..a61f08f1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/settlement/jsCgJindu") +@RequestMapping("/xzd/settlement/jsCgJindu") public class XzdJsCgJinduController extends BaseController { private final IXzdJsCgJinduService xzdJsCgJinduService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java index b67c261c..9d5f3658 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/settlement/jsCgJungon") +@RequestMapping("/xzd/settlement/jsCgJungon") public class XzdJsCgJungonController extends BaseController { private final IXzdJsCgJungonService xzdJsCgJungonService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index 0867cecf..76c65871 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/settlement/jsCgJungonEdit") +@RequestMapping("/xzd/settlement/jsCgJungonEdit") public class XzdJsCgJungonEditController extends BaseController { private final IXzdJsCgJungonEditService xzdJsCgJungonEditService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java index fdc1dc76..32ce6e08 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/settlement/jsZhfwJindu") +@RequestMapping("/xzd/settlement/jsZhfwJindu") public class XzdJsZhfwJinduController extends BaseController { private final IXzdJsZhfwJinduService xzdJsZhfwJinduService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java index 870ddfcf..784bcc24 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fenbaohetongjingdu/ofSubcontractingContract") +@RequestMapping("/xzd/fenbaohetongjingdu/ofSubcontractingContract") public class SettlementOfSubcontractingContractController extends BaseController { private final ISettlementOfSubcontractingContractService settlementOfSubcontractingContractService; 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 b818e210..9db191e5 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 @@ -2,6 +2,8 @@ package org.dromara.xzd.settlement.fenbaohetongjingdu.domain.vo; import java.math.BigDecimal; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.settlement.domain.bo.XzdAlterationInventoryBo; import org.dromara.xzd.settlement.domain.bo.XzdContractInventoryBo; import org.dromara.xzd.settlement.domain.bo.XzdJsDeductionItemsBo; @@ -104,6 +106,7 @@ public class SettlementOfSubcontractingContractVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目名称") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project") private String projectName; /** @@ -128,6 +131,7 @@ public class SettlementOfSubcontractingContractVo implements Serializable { * 结算单位 客户信息名称 */ @ExcelProperty(value = "结算单位 客户信息名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "settlementUnit") private String settlementUnitName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java index 8b3e84ce..892c1a68 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java @@ -119,13 +119,7 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl records) { for (SettlementOfSubcontractingContractVo item : records) { - //项目名称 - if (item.getProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getProject()); - if (projectName != null){ - item.setProjectName(projectName); - } - } + // 分包合同编码 XzdSubcontractVo xzdSubcontractVo = iXzdSubcontractService.queryById(item.getContractCode()); if (xzdSubcontractVo != null){ @@ -133,13 +127,6 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl byid = iXzdCorrespondentList.getCustomerByid(item.getSettlementUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setSettlementUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } // 合同内清单 List xzdContractInventories = iXzdContractInventoryService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdContractInventory::getPrimaryMeterId, item.getId()).eq(XzdContractInventory::getType, ZxdEnum.HETONGLEIXINGNEI.getTypeValue())); if (xzdContractInventories != null && xzdContractInventories.size() > 0) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java index e59deea3..806887aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fenbaohetongjungong/ofSubcontractingCompletion") +@RequestMapping("/xzd/fenbaohetongjungong/ofSubcontractingCompletion") public class SettlementOfSubcontractingCompletionController extends BaseController { private final ISettlementOfSubcontractingCompletionService settlementOfSubcontractingCompletionService; 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 d730ddb6..a853d97f 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 @@ -2,6 +2,8 @@ package org.dromara.xzd.settlement.fenbaohetongjungong.domain.vo; import java.math.BigDecimal; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.domain.vo.XzdJsqdTzVo; import org.dromara.xzd.settlement.domain.vo.XzdJsDeductionItemsVo; import org.dromara.xzd.settlement.fenbaohetongjungong.domain.SettlementOfSubcontractingCompletion; @@ -99,6 +101,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 工程项目名称 */ @ExcelProperty(value = "工程项目名称") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "engineeringProject") private String engineeringProjectName; /** @@ -118,6 +121,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 甲方单位名称 */ @ExcelProperty(value = "甲方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit") private String partyAUnitName; @@ -131,6 +135,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 乙方单位名称 */ @ExcelProperty(value = "乙方单位名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyBUnit") private String partyBUnitName; /** @@ -210,6 +215,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 业主单位名称 客户 */ @ExcelProperty(value = "业主单位名称 客户") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "ownerUnit") private String ownerUnitName; /** @@ -222,6 +228,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 监理单位名称 客户 */ @ExcelProperty(value = "监理单位名称 客户") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "supervisionUnit") private String supervisionUnitName; /** @@ -234,6 +241,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 施工单位名称 客户 */ @ExcelProperty(value = "施工单位名称 客户") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "constructionUnit") private String constructionUnitName; /** @@ -246,6 +254,7 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable { * 审核单位名称 客户 */ @ExcelProperty(value = "审核单位名称 客户") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "auditUnit") private String auditUnitName; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java index cfb01355..9cc517ea 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java @@ -134,32 +134,11 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl } } - //项目名称 - if (item.getEngineeringProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getEngineeringProject()); - if (projectName != null){ - item.setEngineeringProjectName(projectName); - } - } // 分包合同编码 XzdSubcontractVo xzdSubcontractVo = iXzdSubcontractService.queryById(item.getContractCode()); if (xzdSubcontractVo != null){ item.setContractCodeName(xzdSubcontractVo.getContractCode()); } - //甲方单位(客户信息列表) - R byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } - //乙方单位(供应商信息列表) - if (item.getPartyBUnit() != null){ - String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit()); - if (unitName != null){ - item.setPartyBUnitName(unitName); - } - } // 支付条款 if (item.getPaymentTerms() != null){ XzdSettlementRules byId = xzdSettlementRulesService.getById(item.getPaymentTerms()); @@ -167,38 +146,6 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl item.setPaymentTermsName(byId.getType()); } } - - // 业主单位(客户信息列表) - R temp = iXzdCorrespondentList.getCustomerByid(item.getOwnerUnit()); - if (temp!=null){ - if (temp.getData().getXzdCustomerinformation() != null){ - item.setOwnerUnitName(temp.getData().getXzdCustomerinformation().getUnitName()); - } - } - - // 监理单位(客户信息列表) - R supervisionUnit = iXzdCorrespondentList.getCustomerByid(item.getSupervisionUnit()); - if (supervisionUnit!=null){ - if (supervisionUnit.getData().getXzdCustomerinformation() != null){ - item.setSupervisionUnitName(supervisionUnit.getData().getXzdCustomerinformation().getUnitName()); - } - } - - // 施工单位(客户信息列表) - R constructionUnit = iXzdCorrespondentList.getCustomerByid(item.getConstructionUnit()); - if (constructionUnit!=null){ - if (constructionUnit.getData().getXzdCustomerinformation() != null){ - item.setConstructionUnitName(constructionUnit.getData().getXzdCustomerinformation().getUnitName()); - } - } - - // 施工单位(客户信息列表) - R auditUnit = iXzdCorrespondentList.getCustomerByid(item.getAuditUnit()); - if (auditUnit!=null){ - if (auditUnit.getData().getXzdCustomerinformation() != null){ - item.setAuditUnitName(auditUnit.getData().getXzdCustomerinformation().getUnitName()); - } - } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java index 305b8b1a..f9d7bdfd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fenbaohetongtiaozheng/ofSubcontractingAdjustment") +@RequestMapping("/xzd/fenbaohetongtiaozheng/ofSubcontractingAdjustment") public class SettlementOfSubcontractingAdjustmentController extends BaseController { private final ISettlementOfSubcontractingAdjustmentService settlementOfSubcontractingAdjustmentService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java index d3207ceb..ae90ece4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/yueduzijinbiangeng/revenuePlanAlteration") +@RequestMapping("/xzd/yueduzijinbiangeng/revenuePlanAlteration") public class FinancialRevenuePlanAlterationController extends BaseController { private final IFinancialRevenuePlanAlterationService financialRevenuePlanAlterationService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/vo/FinancialRevenuePlanAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/vo/FinancialRevenuePlanAlterationVo.java index 019328b3..4383ab17 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/vo/FinancialRevenuePlanAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/vo/FinancialRevenuePlanAlterationVo.java @@ -65,6 +65,7 @@ public class FinancialRevenuePlanAlterationVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project") private String projectName; private Long deptId; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java index de1d4be5..d909d16d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java @@ -111,13 +111,6 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl records, boolean type) { for (FinancialRevenuePlanAlterationVo item : records) { - //项目名称 - if (item.getProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getProject()); - if (projectName != null){ - item.setProjectName(projectName); - } - } HashMap hashMap = new HashMap<>(); hashMap.put("financial_revenue_id",item.getId()); // 收入 @@ -126,13 +119,6 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl convert = MapstructUtils.convert(detail, DetailOfEarningsVo.class); if (type){ convert.forEach(temp ->{ - //甲方单位(客户信息列表) - R byid = iXzdCorrespondentList.getCustomerByid(temp.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - temp.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } // cbs Long cbs = temp.getCbs(); if (cbs != null){ @@ -155,11 +141,6 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl convert = MapstructUtils.convert(statementOfExpenditures, StatementOfExpendituresVo.class); if (type){ convert.forEach(temp ->{ - //供应商 supplier - String unitName = xzdSupplierInfoService.queryNameById(temp.getSupplier()); - if (StringUtils.isNotBlank(unitName)){ - temp.setSupplierName(unitName); - } Long cbs = temp.getCbs(); if (cbs != null){ String name = iCbsTreeStructureService.queryById(cbs).getName(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java index fa8d1051..d4c258c4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java @@ -33,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/yueduzijinjihua/revenueExpenditurePlan") +@RequestMapping("/xzd/yueduzijinjihua/revenueExpenditurePlan") public class FinancialRevenueExpenditurePlanController extends BaseController { private final IFinancialRevenueExpenditurePlanService financialRevenueExpenditurePlanService; 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 fe69b3eb..b31b1c70 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 @@ -1,6 +1,9 @@ package org.dromara.xzd.zijinjihua.yueduzijinjihua.domain.vo; import java.math.BigDecimal; + +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.zijinjihua.yueduzijinjihua.domain.DetailOfEarnings; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -106,6 +109,7 @@ public class DetailOfEarningsVo implements Serializable { * 甲方单位名称 客户 */ @ExcelProperty(value = "甲方单位名称 客户") + @Translation(type = TransConstant.XZD_GYSXX_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/FinancialRevenueExpenditurePlanVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/FinancialRevenueExpenditurePlanVo.java index 2db5bbe1..35a829ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/FinancialRevenueExpenditurePlanVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/FinancialRevenueExpenditurePlanVo.java @@ -66,6 +66,7 @@ public class FinancialRevenueExpenditurePlanVo implements Serializable { * 项目名称 */ @ExcelProperty(value = "项目名称") + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project") private String projectName; /** 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 c35c4f90..486a01ff 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 @@ -1,6 +1,9 @@ package org.dromara.xzd.zijinjihua.yueduzijinjihua.domain.vo; import java.math.BigDecimal; + +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.zijinjihua.yueduzijinjihua.domain.StatementOfExpenditures; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -99,6 +102,7 @@ public class StatementOfExpendituresVo implements Serializable { * 供应商名称 */ @ExcelProperty(value = "供应商名称") + @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "supplier") private String supplierName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java index 361b1d75..45a2be82 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java @@ -113,13 +113,6 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl records,Boolean type) { for (FinancialRevenueExpenditurePlanVo item : records) { - //项目名称 - if (item.getProject() != null){ - String projectName = xzdProjectService.queryNameById(item.getProject()); - if (projectName != null){ - item.setProjectName(projectName); - } - } HashMap hashMap = new HashMap<>(); hashMap.put("financial_revenue_id",item.getId()); // 收入 @@ -128,13 +121,6 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl convert = MapstructUtils.convert(detail, DetailOfEarningsVo.class); if (type){ convert.forEach(temp ->{ - //甲方单位(客户信息列表) - R byid = iXzdCorrespondentList.getCustomerByid(temp.getPartyAUnit()); - if (byid!=null){ - if (byid.getData().getXzdCustomerinformation() != null){ - temp.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } // cbs Long cbs = temp.getCbs(); if (cbs != null){ @@ -157,11 +143,6 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl convert = MapstructUtils.convert(statementOfExpenditures, StatementOfExpendituresVo.class); if (type){ convert.forEach(temp ->{ - //供应商 supplier - String unitName = xzdSupplierInfoService.queryNameById(temp.getSupplier()); - if (StringUtils.isNotBlank(unitName)){ - temp.setSupplierName(unitName); - } Long cbs = temp.getCbs(); if (cbs != null){ String name = iCbsTreeStructureService.queryById(cbs).getName();