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-11-20 19:47:33 +08:00
parent c3ab46c8c8
commit e26dfc098a
3 changed files with 19 additions and 1 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/settlement/jixiehetongjiesuan/domain/vo/XzdSettlementOfJixieContractVo.java
View File

@ -121,7 +121,7 @@ public class XzdSettlementOfJixieContractVo implements Serializable {
* 结算单位
*/
@ExcelProperty(value = "结算单位 ")
private BigDecimal settlementUnit;
private Long settlementUnit;
/**
* 结算单位 客户信息名称

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/domain/vo/XzdSettlementOfJixieCompletionVo.java
View File

@ -85,6 +85,12 @@ public class XzdSettlementOfJixieCompletionVo implements Serializable {
@ExcelProperty(value = "审定总价")
private BigDecimal approvedTotalPrice;
/**
* 竣工日期
*/
@ExcelProperty(value = "竣工日期")
private LocalDate actualCompletionDate;
/**
* 审定日期
*/

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java
View File

@ -17,11 +17,13 @@ import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService;
import org.dromara.xzd.domain.XzdJsqdTz;
import org.dromara.xzd.domain.XzdProject;
import org.dromara.xzd.domain.bo.XzdJsqdTzBo;
import org.dromara.xzd.domain.vo.XzdJsqdTzVo;
import org.dromara.xzd.enums.XzdClassEnum;
import org.dromara.xzd.enums.ZxdEnum;
import org.dromara.xzd.service.IXzdJsqdTzService;
import org.dromara.xzd.service.IXzdProjectService;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.domain.bo.XzdJsDeductionItemsBo;
import org.dromara.xzd.settlement.domain.vo.XzdJsDeductionItemsVo;
@ -63,6 +65,8 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl<XzdSe
private SysOssServiceImpl sysOssService;
private final IXzdProjectService xzdProjectService;
@Autowired
private IXzdJsDeductionItemsService deductionItemsService;
@ -90,6 +94,14 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl<XzdSe
if (xzdJsDeductionItems != null && xzdJsDeductionItems.size() > 0) {
item.setJlykk(MapstructUtils.convert(xzdJsDeductionItems, XzdJsDeductionItemsVo.class));
}
// 竣工日期回填
if(item.getEngineeringProject() != null){
XzdProject byId = xzdProjectService.getById(item.getEngineeringProject());
if(byId != null){
item.setActualCompletionDate(byId.getActualCompletionDate());
}
}
}
}