lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xzd前缀添加

Browse Source
This commit is contained in:
lg
2025-10-25 17:21:16 +08:00
parent edf0d1a5db
commit e73c808bc3
61 changed files with 105 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdBidPreProjectController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java
View File

@ -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;

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java
View File

@ -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;
/**
* 招标方式
*/

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdBiddingDocumentController.java
View File

@ -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;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java
View File

@ -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;
/**
* 单据日期
*/

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/controller/XzdPostBidAnalysisController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/vo/XzdPurchaseContractSuspendVo.java
View File

@ -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;

21
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java
View File

@ -83,27 +83,6 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
private void setValue(List<XzdPurchaseContractSuspendVo> res) {
for (XzdPurchaseContractSuspendVo item : res) {
// //项目名称
// if (item.getProject() != null){
// String projectName = xzdProjectService.queryNameById(item.getProject());
// if (projectName != null){
// item.setProjectName(projectName);
// }
// }
//甲方单位(客户信息列表)
R<QuerCorrespondentDto> 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());

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java
View File

@ -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;

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

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

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java
View File

@ -97,20 +97,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
for (XzdPurchaseContractAlterationVo item : infos) {
//甲方单位(客户信息列表)
R<QuerCorrespondentDto> 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());

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java
View File

@ -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;

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java
View File

@ -169,6 +169,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
lqw.orderByDesc(XzdSubcontractChange::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), XzdSubcontractChange::getDocumentCode, bo.getDocumentCode());
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdSubcontractChange::getTitle, bo.getTitle());
lqw.eq(StringUtils.isNotBlank(bo.getProjectName()), XzdSubcontractChange::getProjectName, bo.getProjectName());
lqw.eq(bo.getDocumentDate() != null, XzdSubcontractChange::getDocumentDate, bo.getDocumentDate());
lqw.eq(bo.getDeptId() != null, XzdSubcontractChange::getDeptId, bo.getDeptId());
lqw.ge(bo.getStartTime() != null, XzdSubcontractChange::getDocumentDate, bo.getStartTime());

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java
View File

@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/fenbaohetongxinxi/subcontract")
@RequestMapping("/xzd/fenbaohetongxinxi/subcontract")
public class XzdSubcontractController extends BaseController {
private final IXzdSubcontractService xzdSubcontractService;

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

@ -86,6 +86,7 @@ public class XzdSubcontractVo implements Serializable {
* 项目名称
*/
@ExcelProperty(value = "项目名称")
@Translation(type = TransConstant.PROJECT_ID_TO_NAME, mapper = "project")
private String projectName;
/**
@ -129,6 +130,7 @@ public class XzdSubcontractVo implements Serializable {
* 甲方单位名称
*/
@ExcelProperty(value = "甲方单位名称")
@Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyAUnit")
private String partyAUnitName;
@ -142,6 +144,7 @@ public class XzdSubcontractVo implements Serializable {
* 乙方单位名称
*/
@ExcelProperty(value = "乙方单位名称")
@Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyBUnit")
private String partyBUnitName;
/**
@ -161,6 +164,7 @@ public class XzdSubcontractVo implements Serializable {
* 管理组织名称
*/
@ExcelProperty(value = "管理组织名称")
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "managementOrganization")
private String managementOrganizationName;
/**
@ -186,6 +190,7 @@ public class XzdSubcontractVo implements Serializable {
* 开票单位名称
*/
@ExcelProperty(value = "开票单位名称", converter = ExcelDictConvert.class)
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoicingUnit")
private String invoicingUnitName;
/**
@ -198,6 +203,7 @@ public class XzdSubcontractVo implements Serializable {
* 收票单位名称
*/
@ExcelProperty(value = "收票单位名称", converter = ExcelDictConvert.class)
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "ticketReceivingUnit")
private String ticketReceivingUnitName;
/**

38
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
View File

@ -118,44 +118,6 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
private void setValue(List<XzdSubcontractVo> infos) {
for (XzdSubcontractVo item : infos) {
//项目名称
if (item.getProject() != null){
String projectName = xzdProjectService.queryNameById(item.getProject());
if (projectName != null){
item.setProjectName(projectName);
}
}
//甲方单位(客户信息列表)
R<QuerCorrespondentDto> 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<QuerCorrespondentDto> 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<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java
View File

@ -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;

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

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

68
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
View File

@ -406,74 +406,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
public void setValue(List<XzdPurchaseContractInformationVo> 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<QuerCorrespondentDto> 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<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java
View File

@ -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;

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

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

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java
View File

@ -72,7 +72,7 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
XzdGuaranteeInfoVo xzdGuaranteeInfoVo = baseMapper.selectVoById(id);
List<XzdGuaranteeInfoVo> xzdGuaranteeInfoVo1 = List.of(xzdGuaranteeInfoVo);
// 装填数据
setValue(xzdGuaranteeInfoVo1);
// setValue(xzdGuaranteeInfoVo1);
return xzdGuaranteeInfoVo1.getFirst();
@ -113,7 +113,7 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
LambdaQueryWrapper<XzdGuaranteeInfo> lqw = buildQueryWrapper(bo);
Page<XzdGuaranteeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
setValue(result.getRecords());
// setValue(result.getRecords());
return TableDataInfo.build(result);
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java
View File

@ -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;

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

@ -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;

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java
View File

@ -104,13 +104,6 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
}
}
//项目名称
if (item.getProject() != null){
String projectName = xzdProjectService.queryNameById(item.getProject());
if (projectName != null){
item.setProjectName(projectName);
}
}
// 合同
XzdContractDetails contractDetailsServiceById = xzdContractDetailsService.getById(item.getContractNo());
if(contractDetailsServiceById != null){
@ -121,13 +114,6 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
if (taxInfoVo != null){
item.setTaxItemName(taxInfoVo.getTaxItem());
}
//购方名称(客户信息列表)
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(item.getBuyerName());
if (byid!=null){
if (byid.getData().getXzdCustomerinformation() != null){
item.setBuyerNameS(byid.getData().getXzdCustomerinformation().getUnitName());
}
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java
View File

@ -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;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/vo/SettlementOfSubcontractingContractVo.java
View File

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

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java
View File

@ -119,13 +119,7 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl<S
private void setValue(List<SettlementOfSubcontractingContractVo> 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<S
}
//甲方单位(客户信息列表)
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(item.getSettlementUnit());
if (byid!=null){
if (byid.getData().getXzdCustomerinformation() != null){
item.setSettlementUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
}
}
// 合同内清单
List<XzdContractInventory> xzdContractInventories = iXzdContractInventoryService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, item.getId()).eq(XzdContractInventory::getType, ZxdEnum.HETONGLEIXINGNEI.getTypeValue()));
if (xzdContractInventories != null && xzdContractInventories.size() > 0) {

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java
View File

@ -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;

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/vo/SettlementOfSubcontractingCompletionVo.java
View File

@ -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;

53
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java
View File

@ -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<QuerCorrespondentDto> 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<QuerCorrespondentDto> temp = iXzdCorrespondentList.getCustomerByid(item.getOwnerUnit());
if (temp!=null){
if (temp.getData().getXzdCustomerinformation() != null){
item.setOwnerUnitName(temp.getData().getXzdCustomerinformation().getUnitName());
}
}
// 监理单位(客户信息列表)
R<QuerCorrespondentDto> supervisionUnit = iXzdCorrespondentList.getCustomerByid(item.getSupervisionUnit());
if (supervisionUnit!=null){
if (supervisionUnit.getData().getXzdCustomerinformation() != null){
item.setSupervisionUnitName(supervisionUnit.getData().getXzdCustomerinformation().getUnitName());
}
}
// 施工单位(客户信息列表)
R<QuerCorrespondentDto> constructionUnit = iXzdCorrespondentList.getCustomerByid(item.getConstructionUnit());
if (constructionUnit!=null){
if (constructionUnit.getData().getXzdCustomerinformation() != null){
item.setConstructionUnitName(constructionUnit.getData().getXzdCustomerinformation().getUnitName());
}
}
// 施工单位(客户信息列表)
R<QuerCorrespondentDto> auditUnit = iXzdCorrespondentList.getCustomerByid(item.getAuditUnit());
if (auditUnit!=null){
if (auditUnit.getData().getXzdCustomerinformation() != null){
item.setAuditUnitName(auditUnit.getData().getXzdCustomerinformation().getUnitName());
}
}
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java
View File

@ -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;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java
View File

@ -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;

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/vo/FinancialRevenuePlanAlterationVo.java
View File

@ -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;

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java
View File

@ -111,13 +111,6 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl<Finan
private void savaValue(List<FinancialRevenuePlanAlterationVo> records, boolean type) {
for (FinancialRevenuePlanAlterationVo item : records) {
//项目名称
if (item.getProject() != null){
String projectName = xzdProjectService.queryNameById(item.getProject());
if (projectName != null){
item.setProjectName(projectName);
}
}
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("financial_revenue_id",item.getId());
// 收入
@ -126,13 +119,6 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl<Finan
List<DetailOfEarningsVo> convert = MapstructUtils.convert(detail, DetailOfEarningsVo.class);
if (type){
convert.forEach(temp ->{
//甲方单位(客户信息列表)
R<QuerCorrespondentDto> 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<Finan
List<StatementOfExpendituresVo> 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();

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java
View File

@ -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;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/DetailOfEarningsVo.java
View File

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

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/FinancialRevenueExpenditurePlanVo.java
View File

@ -66,6 +66,7 @@ public class FinancialRevenueExpenditurePlanVo implements Serializable {
* 项目名称
*/
@ExcelProperty(value = "项目名称")
@Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project")
private String projectName;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/StatementOfExpendituresVo.java
View File

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

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java
View File

@ -113,13 +113,6 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl<Fina
private void savaValue(List<FinancialRevenueExpenditurePlanVo> records,Boolean type) {
for (FinancialRevenueExpenditurePlanVo item : records) {
//项目名称
if (item.getProject() != null){
String projectName = xzdProjectService.queryNameById(item.getProject());
if (projectName != null){
item.setProjectName(projectName);
}
}
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("financial_revenue_id",item.getId());
// 收入
@ -128,13 +121,6 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl<Fina
List<DetailOfEarningsVo> convert = MapstructUtils.convert(detail, DetailOfEarningsVo.class);
if (type){
convert.forEach(temp ->{
//甲方单位(客户信息列表)
R<QuerCorrespondentDto> 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<Fina
List<StatementOfExpendituresVo> 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();