diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java index 5fd6a152..ae6f32d1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java @@ -131,6 +131,7 @@ public class XzdSkyfkFbhtfkVo implements Serializable { * 付款单位 */ @ExcelProperty(value = "付款单位") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "fkdwId") private String fkdw; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java index d5460b37..c36846d2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java @@ -15,8 +15,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.utils.BatchNumberGenerator; 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.domain.XzdProject; import org.dromara.xzd.domain.XzdProjectType; import org.dromara.xzd.domain.vo.XzdProjectTypeVo; 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.service.impl.XzdSfkFapiaoServiceImpl; 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.XzdSupplierInfoServiceImpl; import org.dromara.xzd.service.impl.XzdSupplierOpenBankServiceImpl; @@ -74,6 +76,8 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl vos){ for (XzdSkyfkFbhtfkVo vo : vos) { if (vo.getContractId() != null){ - XzdSubcontractVo xzdSubcontractVo = xzdSubcontract.queryById(vo.getContractId()); + XzdSubcontract xzdSubcontractVo = xzdSubcontract.getBaseMapper().selectById(vo.getContractId()); if (xzdSubcontractVo != null){ //合同对象 - vo.setContract(xzdSubcontractVo); +// vo.setContract(xzdSubcontractVo); //合同编码 vo.setContractCode(xzdSubcontractVo.getContractCode()); //合同名称 @@ -335,11 +339,16 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl