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

10-30-修改分包合同付款

Browse Source
This commit is contained in:
青云
2025-11-03 15:15:54 +08:00
parent 373528b432
commit 5962f694e2
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java
View File

@ -131,6 +131,7 @@ public class XzdSkyfkFbhtfkVo implements Serializable {
* 付款单位 * 付款单位
*/ */
@ExcelProperty(value = "付款单位") @ExcelProperty(value = "付款单位")
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "fkdwId")
private String fkdw; private String fkdw;
/** /**

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
View File

@ -15,8 +15,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.impl.XzdSubcontractServiceImpl; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.impl.XzdSubcontractServiceImpl;
import org.dromara.xzd.domain.XzdProject;
import org.dromara.xzd.domain.XzdProjectType; import org.dromara.xzd.domain.XzdProjectType;
import org.dromara.xzd.domain.vo.XzdProjectTypeVo; import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo; import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
@ -28,6 +29,7 @@ import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo;
import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFukuanVo; import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFukuanVo;
import org.dromara.xzd.paymentsReceipts.service.impl.XzdSfkFapiaoServiceImpl; import org.dromara.xzd.paymentsReceipts.service.impl.XzdSfkFapiaoServiceImpl;
import org.dromara.xzd.paymentsReceipts.service.impl.XzdSfkFukuanServiceImpl; import org.dromara.xzd.paymentsReceipts.service.impl.XzdSfkFukuanServiceImpl;
import org.dromara.xzd.service.impl.XzdProjectServiceImpl;
import org.dromara.xzd.service.impl.XzdProjectTypeServiceImpl; import org.dromara.xzd.service.impl.XzdProjectTypeServiceImpl;
import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl; import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl;
import org.dromara.xzd.service.impl.XzdSupplierOpenBankServiceImpl; import org.dromara.xzd.service.impl.XzdSupplierOpenBankServiceImpl;
@ -74,6 +76,8 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
private XzdSupplierOpenBankServiceImpl xzdSupplierOpenBankService; private XzdSupplierOpenBankServiceImpl xzdSupplierOpenBankService;
@Autowired @Autowired
private XzdProjectTypeServiceImpl xzdProjectTypeService; private XzdProjectTypeServiceImpl xzdProjectTypeService;
@Autowired
private XzdProjectServiceImpl xzdProjectService;
/** /**
* 查询收款与付款-分包合同付款 * 查询收款与付款-分包合同付款
@ -324,10 +328,10 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
public void setValue(List<XzdSkyfkFbhtfkVo> vos){ public void setValue(List<XzdSkyfkFbhtfkVo> vos){
for (XzdSkyfkFbhtfkVo vo : vos) { for (XzdSkyfkFbhtfkVo vo : vos) {
if (vo.getContractId() != null){ if (vo.getContractId() != null){
XzdSubcontractVo xzdSubcontractVo = xzdSubcontract.queryById(vo.getContractId()); XzdSubcontract xzdSubcontractVo = xzdSubcontract.getBaseMapper().selectById(vo.getContractId());
if (xzdSubcontractVo != null){ if (xzdSubcontractVo != null){
//合同对象 //合同对象
vo.setContract(xzdSubcontractVo); // vo.setContract(xzdSubcontractVo);
//合同编码 //合同编码
vo.setContractCode(xzdSubcontractVo.getContractCode()); vo.setContractCode(xzdSubcontractVo.getContractCode());
//合同名称 //合同名称
@ -335,11 +339,16 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
//项目id //项目id
vo.setProjectId(xzdSubcontractVo.getProject()); vo.setProjectId(xzdSubcontractVo.getProject());
//项目名称 //项目名称
vo.setProjectName(xzdSubcontractVo.getProjectName()); if (xzdSubcontractVo.getProject() != null){
XzdProject xzdProject = xzdProjectService.getBaseMapper().selectById(xzdSubcontractVo.getProject());
if (xzdProject != null){
vo.setProjectName(xzdProject.getProjectName());
}
}
//甲方单位id //甲方单位id
vo.setFkdwId(xzdSubcontractVo.getPartyAUnit()); vo.setFkdwId(xzdSubcontractVo.getPartyAUnit());
//甲方单位名称 //甲方单位名称
vo.setFkdw(xzdSubcontractVo.getPartyAUnitName()); // vo.setFkdw(xzdSubcontractVo.getPartyAUnitName());
} }
} }
//收款单位 //收款单位