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

采购合同修改

Browse Source
This commit is contained in:
lg
2025-10-23 17:18:36 +08:00
parent 45ac1817e1
commit 0d5a9eb505
5 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java
View File

@ -129,4 +129,10 @@ public class XzdPurchaseContractSuspendBo extends BaseEntity {
private String auditStatus;
private LocalDate startDate;
private LocalDate endDate;
}

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

@ -150,6 +150,11 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
lqw.eq(StringUtils.isNotBlank(bo.getReceiptsCode()), XzdPurchaseContractSuspend::getReceiptsCode, bo.getReceiptsCode());
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdPurchaseContractSuspend::getTitle, bo.getTitle());
lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getDocumentDate());
lqw.ge(bo.getStartDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getStartDate());
lqw.le(bo.getEndDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getEndDate());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdPurchaseContractSuspend::getContractName, bo.getContractName());
lqw.eq(bo.getTerminationDate() != null, XzdPurchaseContractSuspend::getTerminationDate, bo.getTerminationDate());
lqw.eq(StringUtils.isNotBlank(bo.getProject()), XzdPurchaseContractSuspend::getProject, bo.getProject());

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

@ -91,6 +91,9 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
@Override
public XzdSubcontractVo queryById(Long id){
XzdSubcontractVo xzdSubcontractVo = baseMapper.selectVoById(id);
if (xzdSubcontractVo == null){
return null;
}
List<XzdSubcontractVo> informationVo = List.of(xzdSubcontractVo);
// 装填数据
setValue(informationVo);

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

@ -153,6 +153,7 @@ public class XzdPurchaseContractInformationVo implements Serializable {
* 管理组织名称
*/
@ExcelProperty(value = "管理组织名称")
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "managementOrganization")
private String managementOrganizationName;
/**
@ -315,6 +316,12 @@ public class XzdPurchaseContractInformationVo implements Serializable {
@ExcelProperty(value = "关联主合同")
private String associatedMainContract;
/**
* 关联主合同
*/
@ExcelProperty(value = "关联主合同")
private String associatedMainContractName;
/**
* 项目责任人
*/

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

@ -410,6 +410,17 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
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());
@ -431,12 +442,12 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
item.setPartyBUnitName(unitName);
}
}
//管理组织(供应商)
String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit());
if (unitName != null){
item.setManagementOrganizationName(unitName);
}
// //管理组织
// String unitName = xzdSupplierInfoService.queryNameById(item.getManagementOrganization());
//
// if (unitName != null){
// item.setManagementOrganizationName(unitName);
// }
//开票单位名称(供应商名称)
String unitName1 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit());
if (unitName1 != null){