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

10-25-字段调整

Browse Source
This commit is contained in:
青云
2025-10-25 16:44:33 +08:00
parent 56fc4ff83e
commit 39bedfeb92
19 changed files with 214 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java
View File

@ -1,14 +1,13 @@
package org.dromara.xzd.domain.vo; package org.dromara.xzd.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractAccount;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdJsqdTz;
import org.dromara.xzd.domain.XzdSettlementRules; import org.dromara.xzd.domain.XzdSettlementRules;
import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.domain.XzdZbjghyd;
@ -17,6 +16,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
@ -192,6 +193,7 @@ public class XzdContractAccountVo implements Serializable {
/** /**
* 业主单位名称 * 业主单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "owner")
private String ownerName; private String ownerName;
/** /**
@ -203,6 +205,7 @@ public class XzdContractAccountVo implements Serializable {
/** /**
* 监理单位名称 * 监理单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "supervision")
private String supervisionName; private String supervisionName;
/** /**
@ -214,6 +217,7 @@ public class XzdContractAccountVo implements Serializable {
/** /**
* 审核单位名称 * 审核单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "review")
private String reviewName; private String reviewName;
private String fileId; private String fileId;

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

@ -6,6 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.domain.XzdContractAgreement; import org.dromara.xzd.domain.XzdContractAgreement;
import java.io.Serial; import java.io.Serial;
@ -61,6 +63,7 @@ public class XzdContractAgreementVo implements Serializable {
/** /**
* 客户单位名称 * 客户单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "partyAUnit")
private String partyAUnitName; private String partyAUnitName;
/** /**
@ -72,6 +75,7 @@ public class XzdContractAgreementVo implements Serializable {
/** /**
* 供应商单位名称 * 供应商单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "partyBUnit")
private String partyBUnitName; private String partyBUnitName;
/** /**

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

@ -7,6 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -180,7 +182,7 @@ public class XzdContractChangeVo implements Serializable {
// private String originalInvoiceUnit; // private String originalInvoiceUnit;
/** /**
* 现收票单位 * 现收票单位(客户)
*/ */
@ExcelProperty(value = "现收票单位") @ExcelProperty(value = "现收票单位")
private Long currentInvoiceUnit; private Long currentInvoiceUnit;
@ -188,6 +190,7 @@ public class XzdContractChangeVo implements Serializable {
/** /**
* 现收票单位名 * 现收票单位名
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "currentInvoiceUnit")
private String currentInvoiceUnitName; private String currentInvoiceUnitName;
/** /**

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
View File

@ -1,21 +1,22 @@
package org.dromara.xzd.domain.vo; package org.dromara.xzd.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
@ -111,6 +112,7 @@ public class XzdContractDetailsVo implements Serializable {
/** /**
* 甲方单位名称 * 甲方单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "partyAUnit")
private String partyAUnitName; private String partyAUnitName;
/** /**
@ -122,6 +124,7 @@ public class XzdContractDetailsVo implements Serializable {
/** /**
* 乙方单位名称 * 乙方单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyBUnit")
private String partyBUnitName; private String partyBUnitName;
/** /**
@ -136,7 +139,7 @@ public class XzdContractDetailsVo implements Serializable {
private BigDecimal contractAmount; private BigDecimal contractAmount;
/** /**
* 开票单位 * 开票单位(供应商)
*/ */
@ExcelProperty(value = "开票单位") @ExcelProperty(value = "开票单位")
private Long invoicingUnit; private Long invoicingUnit;
@ -144,6 +147,7 @@ public class XzdContractDetailsVo implements Serializable {
/** /**
* 开票单位名称 * 开票单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "invoicingUnit")
private String invoicingUnitName; private String invoicingUnitName;
/** /**
@ -164,7 +168,7 @@ public class XzdContractDetailsVo implements Serializable {
private XzdBudgetClassification budgetClassificationObj; private XzdBudgetClassification budgetClassificationObj;
/** /**
* 收票单位 * 收票单位(客户)
*/ */
@ExcelProperty(value = "收票单位") @ExcelProperty(value = "收票单位")
private Long ticketReceivingUnit; private Long ticketReceivingUnit;
@ -172,6 +176,7 @@ public class XzdContractDetailsVo implements Serializable {
/** /**
* 收票单位名称 * 收票单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "ticketReceivingUnit")
private String ticketReceivingUnitName; private String ticketReceivingUnitName;
/** /**
@ -224,7 +229,7 @@ public class XzdContractDetailsVo implements Serializable {
private String capitalizedTaxInclusiveTotal; private String capitalizedTaxInclusiveTotal;
/** /**
* 签约组织 * 签约组织(供应商)
*/ */
@ExcelProperty(value = "签约组织") @ExcelProperty(value = "签约组织")
private Long signingOrganization; private Long signingOrganization;
@ -232,6 +237,7 @@ public class XzdContractDetailsVo implements Serializable {
/** /**
* 签约组织名称 * 签约组织名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "signingOrganization")
private String signingOrganizationName; private String signingOrganizationName;
/** /**

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java
View File

@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdContractProgressSettlement; import org.dromara.xzd.domain.XzdContractProgressSettlement;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory; import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
@ -158,6 +160,7 @@ public class XzdContractProgressSettlementVo implements Serializable {
/** /**
* 结算单位名称 * 结算单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME ,mapper = "settlementUnit")
private String settlementUnitName; private String settlementUnitName;
/** /**

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

@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.domain.XzdProject; import org.dromara.xzd.domain.XzdProject;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -204,8 +206,9 @@ public class XzdProjectVo implements Serializable {
private Long constructionUnit; private Long constructionUnit;
/** /**
* 建设单位名 * 建设单位名(客户)
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "constructionUnit")
private String constructionUnitName; private String constructionUnitName;
/** /**

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
View File

@ -1,14 +1,15 @@
package org.dromara.xzd.domain.vo; package org.dromara.xzd.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.*;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
@ -32,7 +33,7 @@ public class XzdSupplierInfoVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* * id
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Long id; private Long id;
@ -47,6 +48,7 @@ public class XzdSupplierInfoVo implements Serializable {
* 单位名称 * 单位名称
*/ */
@ExcelProperty(value = "单位名称") @ExcelProperty(value = "单位名称")
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "id")
private String unitName; private String unitName;
/** /**

83
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java
View File

@ -1,41 +1,35 @@
package org.dromara.xzd.service.impl; package org.dromara.xzd.service.impl;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.toolkit.ParameterUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
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.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdJsqdTz;
import org.dromara.xzd.domain.XzdSettlementRules; import org.dromara.xzd.domain.XzdSettlementRules;
import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.domain.XzdZbjghyd;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.domain.bo.XzdContractAccountBo;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdSettlementRulesVo; import org.dromara.xzd.mapper.XzdContractAccountMapper;
import org.dromara.xzd.service.IXzdContractAccountService;
import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.IXzdCorrespondentList;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl; import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.xzd.domain.bo.XzdContractAccountBo;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.xzd.mapper.XzdContractAccountMapper;
import org.dromara.xzd.service.IXzdContractAccountService;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection;
/** /**
* 承包合同竣工结算Service业务层处理 * 承包合同竣工结算Service业务层处理
@ -341,9 +335,6 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
//获取合同对象 //获取合同对象
XzdContractDetailsVo detailsVo = xzdContractDetailsService.queryById(vo.getContractId()); XzdContractDetailsVo detailsVo = xzdContractDetailsService.queryById(vo.getContractId());
if (detailsVo != null){ if (detailsVo != null){
List<XzdContractDetailsVo> detailsVo1 = List.of(detailsVo);
xzdContractDetailsService.setValue(detailsVo1);
detailsVo = detailsVo1.getFirst();
//合同名称 //合同名称
vo.setContractName(detailsVo.getContractName()); vo.setContractName(detailsVo.getContractName());
//合同编码 //合同编码
@ -365,34 +356,32 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
} }
} }
//业主单位 //业主单位
if (vo.getOwner() != null){ // if (vo.getOwner() != null){
R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getOwner()); // R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getOwner());
if (byid2 != null) { // if (byid2 != null) {
if (byid2.getData().getXzdCustomerinformation() != null) { // if (byid2.getData().getXzdCustomerinformation() != null) {
vo.setOwnerName(byid2.getData().getXzdCustomerinformation().getUnitName()); // vo.setOwnerName(byid2.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//监理单位 //监理单位
if (vo.getSupervision() != null){ // if (vo.getSupervision() != null){
if (vo.getOwner() != null){ // R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getSupervision());
R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getSupervision()); // if (byid2 != null) {
if (byid2 != null) { // if (byid2.getData().getXzdCustomerinformation() != null) {
if (byid2.getData().getXzdCustomerinformation() != null) { // vo.setSupervisionName(byid2.getData().getXzdCustomerinformation().getUnitName());
vo.setSupervisionName(byid2.getData().getXzdCustomerinformation().getUnitName()); // }
} // }
} // }
}
}
//审核单位 //审核单位
if (vo.getReview() != null){ // if (vo.getReview() != null){
R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getReview()); // R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getReview());
if (byid2 != null) { // if (byid2 != null) {
if (byid2.getData().getXzdCustomerinformation() != null) { // if (byid2.getData().getXzdCustomerinformation() != null) {
vo.setReviewName(byid2.getData().getXzdCustomerinformation().getUnitName()); // vo.setReviewName(byid2.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//决算清单 //决算清单
LambdaQueryWrapper<XzdJsqdTz> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<XzdJsqdTz> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(XzdJsqdTz::getMainId, vo.getId()); queryWrapper.eq(XzdJsqdTz::getMainId, vo.getId());

31
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAgreementServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -18,9 +17,7 @@ import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl;
import org.dromara.xzd.domain.XzdContractAgreement; import org.dromara.xzd.domain.XzdContractAgreement;
import org.dromara.xzd.domain.bo.XzdContractAgreementBo; import org.dromara.xzd.domain.bo.XzdContractAgreementBo;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.XzdContractAgreementVo; import org.dromara.xzd.domain.vo.XzdContractAgreementVo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.dromara.xzd.mapper.XzdContractAgreementMapper; import org.dromara.xzd.mapper.XzdContractAgreementMapper;
import org.dromara.xzd.service.IXzdContractAgreementService; import org.dromara.xzd.service.IXzdContractAgreementService;
import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.IXzdCorrespondentList;
@ -203,21 +200,21 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
public void setValue(List<XzdContractAgreementVo> vos){ public void setValue(List<XzdContractAgreementVo> vos){
for (XzdContractAgreementVo vo : vos) { for (XzdContractAgreementVo vo : vos) {
//客户单位 //客户单位
if (vo.getPartyAUnit() != null) { // if (vo.getPartyAUnit() != null) {
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getPartyAUnit()); // R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getPartyAUnit());
if (byid != null) { // if (byid != null) {
if (byid.getData().getXzdCustomerinformation() != null) { // if (byid.getData().getXzdCustomerinformation() != null) {
vo.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); // vo.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//供应商单位 //供应商单位
if (vo.getPartyBUnit() != null) { // if (vo.getPartyBUnit() != null) {
XzdSupplierInfoVo supplierInfoVo = xzdSupplierInfoService.queryById(vo.getPartyBUnit()); // XzdSupplierInfoVo supplierInfoVo = xzdSupplierInfoService.queryById(vo.getPartyBUnit());
if (supplierInfoVo != null) { // if (supplierInfoVo != null) {
vo.setPartyBUnitName(supplierInfoVo.getUnitName()); // vo.setPartyBUnitName(supplierInfoVo.getUnitName());
} // }
} // }
//部门公司 //部门公司
SysDeptVo sysDeptVo = sysDeptService.selectDeptById(vo.getCompanyId()); SysDeptVo sysDeptVo = sysDeptService.selectDeptById(vo.getCompanyId());
if (sysDeptVo != null){ if (sysDeptVo != null){

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -20,7 +19,6 @@ import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.XzdContractChangeBo; import org.dromara.xzd.domain.bo.XzdContractChangeBo;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
import org.dromara.xzd.domain.vo.XzdContractChangeVo; import org.dromara.xzd.domain.vo.XzdContractChangeVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
@ -404,14 +402,14 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
} }
//收票单位名称(客户名称) //收票单位名称(客户名称)
if (vo.getCurrentInvoiceUnit() != null) { // if (vo.getCurrentInvoiceUnit() != null) {
R<QuerCorrespondentDto> byid2 = xzdCorrespondentListService.getCustomerByid(vo.getCurrentInvoiceUnit()); // R<QuerCorrespondentDto> byid2 = xzdCorrespondentListService.getCustomerByid(vo.getCurrentInvoiceUnit());
if (byid2 != null) { // if (byid2 != null) {
if (byid2.getData().getXzdCustomerinformation() != null) { // if (byid2.getData().getXzdCustomerinformation() != null) {
vo.setCurrentInvoiceUnitName(byid2.getData().getXzdCustomerinformation().getUnitName()); // vo.setCurrentInvoiceUnitName(byid2.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//变更后项目经理 //变更后项目经理
if (vo.getPostChangeProjectManager() != null){ if (vo.getPostChangeProjectManager() != null){

71
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -20,10 +19,9 @@ import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.bo.XzdContractDetailsBo;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.dromara.xzd.enums.XzdClassEnum; import org.dromara.xzd.enums.XzdClassEnum;
import org.dromara.xzd.mapper.XzdContractDetailsMapper; import org.dromara.xzd.mapper.XzdContractDetailsMapper;
@ -460,51 +458,50 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
} }
//项目名称 //项目名称
if (info.getProject() != null) { if (info.getProject() != null) {
XzdProjectVo projectVo = xzdProjectService.queryById(info.getProject()); XzdProject projectVo = xzdProjectService.getBaseMapper().selectById(info.getProject());
if (projectVo != null) { if (projectVo != null) {
info.setProjectName(projectVo.getProjectName()); info.setProjectName(projectVo.getProjectName());
info.setProjectType(projectVo.getProjectTypeName()); XzdProjectTypeVo bigType = xzdProjectTypeService.getBigType(projectVo.getProjectType());
if (bigType != null){
info.setProjectType(bigType.getTypeName());
}
} }
} }
//甲方单位(客户信息列表) //甲方单位(客户信息列表)
if (info.getPartyAUnit() != null) { // if (info.getPartyAUnit() != null) {
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(info.getPartyAUnit()); // R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(info.getPartyAUnit());
if (byid != null) { // if (byid != null) {
if (byid.getData().getXzdCustomerinformation() != null) { // if (byid.getData().getXzdCustomerinformation() != null) {
info.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); // info.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//乙方单位(供应商信息列表) //乙方单位(供应商信息列表)
if (info.getPartyBUnit() != null) { if (info.getPartyBUnit() != null) {
XzdSupplierInfoVo xzdSupplierInfoVo = xzdSupplierInfoService.queryById(info.getPartyBUnit()); //供应商开户银行
if (xzdSupplierInfoVo != null) { LambdaQueryWrapper<XzdSupplierOpenBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
info.setPartyBUnitName(xzdSupplierInfoVo.getUnitName()); lambdaQueryWrapper.eq(XzdSupplierOpenBank::getSupplierId, info.getPartyBUnit());
//供应商开户银行 List<XzdSupplierOpenBank> xzdSupplierOpenBanks = xzdSupplierOpenBankService.list(lambdaQueryWrapper);
LambdaQueryWrapper<XzdSupplierOpenBank> lambdaQueryWrapper = new LambdaQueryWrapper<>(); if (!xzdSupplierOpenBanks.isEmpty()) {
lambdaQueryWrapper.eq(XzdSupplierOpenBank::getSupplierId, info.getPartyBUnit()); info.setPartyBUnitOpeningBank(xzdSupplierOpenBanks);
List<XzdSupplierOpenBank> xzdSupplierOpenBanks = xzdSupplierOpenBankService.list(lambdaQueryWrapper);
if (!xzdSupplierOpenBanks.isEmpty()) {
info.setPartyBUnitOpeningBank(xzdSupplierOpenBanks);
}
} }
} }
//开票单位名称(供应商名称) //开票单位名称(供应商名称)
if (info.getInvoicingUnit() != null) { // if (info.getInvoicingUnit() != null) {
XzdSupplierInfoVo xzdSupplierInfoVo1 = xzdSupplierInfoService.queryById(info.getInvoicingUnit()); // XzdSupplierInfoVo xzdSupplierInfoVo1 = xzdSupplierInfoService.queryById(info.getInvoicingUnit());
if (xzdSupplierInfoVo1 != null) { // if (xzdSupplierInfoVo1 != null) {
info.setInvoicingUnitName(xzdSupplierInfoVo1.getUnitName()); // info.setInvoicingUnitName(xzdSupplierInfoVo1.getUnitName());
} // }
} // }
//收票单位名称(客户名称) //收票单位名称(客户名称)
if (info.getTicketReceivingUnit() != null) { // if (info.getTicketReceivingUnit() != null) {
R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(info.getTicketReceivingUnit()); // R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(info.getTicketReceivingUnit());
if (byid2 != null) { // if (byid2 != null) {
if (byid2.getData().getXzdCustomerinformation() != null) { // if (byid2.getData().getXzdCustomerinformation() != null) {
info.setTicketReceivingUnitName(byid2.getData().getXzdCustomerinformation().getUnitName()); // info.setTicketReceivingUnitName(byid2.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//印章名称 //印章名称
if (info.getSealName() != null) { if (info.getSealName() != null) {
XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(info.getSealName()); XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(info.getSealName());

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.service.XzdProjectService; import org.dromara.common.core.service.XzdProjectService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.SpringUtils;
@ -22,7 +21,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.*; import org.dromara.xzd.domain.bo.*;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.*; import org.dromara.xzd.domain.vo.*;
import org.dromara.xzd.mapper.XzdProjectMapper; import org.dromara.xzd.mapper.XzdProjectMapper;
import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.IXzdCorrespondentList;
@ -550,13 +548,13 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
participatingUnitsLambdaQueryWrapper.eq(XzdProjectParticipatingUnits::getXzdProjectId, entity.getId()); participatingUnitsLambdaQueryWrapper.eq(XzdProjectParticipatingUnits::getXzdProjectId, entity.getId());
entity.setCjdw(xzdProjectParticipatingUnitsService.getBaseMapper().selectVoList(participatingUnitsLambdaQueryWrapper)); entity.setCjdw(xzdProjectParticipatingUnitsService.getBaseMapper().selectVoList(participatingUnitsLambdaQueryWrapper));
//建设单位 //建设单位(客户)
R<QuerCorrespondentDto> byId = iXzdCorrespondentList.getCustomerByid(entity.getConstructionUnit()); // R<QuerCorrespondentDto> byId = iXzdCorrespondentList.getCustomerByid(entity.getConstructionUnit());
if (byId != null) { // if (byId != null) {
if (byId.getData().getXzdCustomerinformation() != null) { // if (byId.getData().getXzdCustomerinformation() != null) {
entity.setConstructionUnitName(byId.getData().getXzdCustomerinformation().getUnitName()); // entity.setConstructionUnitName(byId.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
// entity.setConstructionUnitName(iXzdCorrespondentList); // entity.setConstructionUnitName(iXzdCorrespondentList);
//备案项目经理 //备案项目经理

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

@ -11,11 +11,11 @@ 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.domain.XzdContractDetails;
import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdJsqdTz;
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo; import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo;
import org.dromara.xzd.domain.vo.XzdContractAccountVo; import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.domain.vo.XzdProjectVo;
import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo; import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo;
import org.dromara.xzd.mapper.XzdWorkcontractCompletionAdjustMapper; import org.dromara.xzd.mapper.XzdWorkcontractCompletionAdjustMapper;
@ -321,7 +321,7 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
//从竣工获取合同 //从竣工获取合同
if (vo.getContractId() != null){ if (vo.getContractId() != null){
//合同 //合同
XzdContractDetailsVo xzdContractVo = xzdContractDetailsService.queryById(vo.getContractId()); XzdContractDetails xzdContractVo = xzdContractDetailsService.getBaseMapper().selectById(vo.getContractId());
if (xzdContractVo != null){ if (xzdContractVo != null){
//合同名称 //合同名称
vo.setContractName(xzdContractVo.getContractName()); vo.setContractName(xzdContractVo.getContractName());

17
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java
View File

@ -1,21 +1,22 @@
package org.dromara.xzd.skyfk.cbhtsc.domain.vo; package org.dromara.xzd.skyfk.cbhtsc.domain.vo;
import java.math.BigDecimal; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
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.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdContractSkxxVo; import org.dromara.xzd.domain.vo.XzdContractSkxxVo;
import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo; import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo;
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment; import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
@ -109,12 +110,12 @@ public class XzdContractPaymentVo implements Serializable {
/** /**
* 付款单位(客户)id * 付款单位(客户)id
*/ */
@ExcelProperty(value = "付款单位(客户)id")
private Long payer; private Long payer;
/** /**
* 付款单位(客户)名称 * 付款单位(客户)名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "payer")
private String payerName; private String payerName;
/** /**

21
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -16,7 +15,6 @@ import org.dromara.ctr.service.impl.ContractPaymentClauseServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdContractSkxx; import org.dromara.xzd.domain.XzdContractSkxx;
import org.dromara.xzd.domain.bo.XzdContractSkxxBo; import org.dromara.xzd.domain.bo.XzdContractSkxxBo;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdContractSkxxVo; import org.dromara.xzd.domain.vo.XzdContractSkxxVo;
import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.domain.vo.XzdProjectVo;
@ -292,9 +290,6 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractId()); XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractId());
if (xzdContractDetailsVo != null){ if (xzdContractDetailsVo != null){
vo.setContract(xzdContractDetailsVo); vo.setContract(xzdContractDetailsVo);
List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
xzdContractDetailsService.setValue(xzdContractDetailsVo1);
xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
//合同编码 //合同编码
vo.setContractCode(xzdContractDetailsVo.getContractCode()); vo.setContractCode(xzdContractDetailsVo.getContractCode());
//合同名称 //合同名称
@ -333,14 +328,14 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
fapiaoBo.setMainDocumentId(vo.getId()); fapiaoBo.setMainDocumentId(vo.getId());
vo.setFpxx(sfkFapiaoService.queryList(fapiaoBo)); vo.setFpxx(sfkFapiaoService.queryList(fapiaoBo));
//付款单位 //付款单位
if (vo.getPayer() != null){ // if (vo.getPayer() != null){
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getPayer()); // R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getPayer());
if (byid != null) { // if (byid != null) {
if (byid.getData().getXzdCustomerinformation() != null) { // if (byid.getData().getXzdCustomerinformation() != null) {
vo.setPayerName(byid.getData().getXzdCustomerinformation().getUnitName()); // vo.setPayerName(byid.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
} }
} }

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

@ -1,23 +1,21 @@
package org.dromara.xzd.skyfk.fbhtfk.domain.vo; package org.dromara.xzd.skyfk.fbhtfk.domain.vo;
import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
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.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo;
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFukuanBo;
import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo; 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.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk; import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
@ -142,6 +140,7 @@ public class XzdSkyfkFbhtfkVo implements Serializable {
* 收款单位 * 收款单位
*/ */
@ExcelProperty(value = "收款单位") @ExcelProperty(value = "收款单位")
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "skdwId")
private String skdw; private String skdw;
/** /**

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

@ -1,23 +1,21 @@
package org.dromara.xzd.skyfk.fbhtfk.service.impl; package org.dromara.xzd.skyfk.fbhtfk.service.impl;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.checkerframework.checker.units.qual.A;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
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.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.SysOss;
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.vo.XzdSubcontractVo;
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.impl.XzdSubcontractServiceImpl; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.impl.XzdSubcontractServiceImpl;
import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdProjectType;
import org.dromara.xzd.domain.vo.*; import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFapiao; import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFapiao;
import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFukuan; import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFukuan;
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo; import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo;
@ -26,20 +24,22 @@ 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.*; import org.dromara.xzd.service.impl.XzdProjectTypeServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl;
import org.springframework.stereotype.Service; import org.dromara.xzd.service.impl.XzdSupplierOpenBankServiceImpl;
import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk;
import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo;
import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo;
import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk;
import org.dromara.xzd.skyfk.fbhtfk.mapper.XzdSkyfkFbhtfkMapper; import org.dromara.xzd.skyfk.fbhtfk.mapper.XzdSkyfkFbhtfkMapper;
import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService; import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection;
/** /**
* 收款与付款-分包合同付款Service业务层处理 * 收款与付款-分包合同付款Service业务层处理
@ -94,6 +94,7 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
public TableDataInfo<XzdSkyfkFbhtfkVo> queryPageList(XzdSkyfkFbhtfkBo bo, PageQuery pageQuery) { public TableDataInfo<XzdSkyfkFbhtfkVo> queryPageList(XzdSkyfkFbhtfkBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdSkyfkFbhtfk> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<XzdSkyfkFbhtfk> lqw = buildQueryWrapper(bo);
Page<XzdSkyfkFbhtfkVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<XzdSkyfkFbhtfkVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
setValue(result.getRecords());
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@ -319,9 +320,6 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
if (vo.getContractId() != null){ if (vo.getContractId() != null){
XzdSubcontractVo xzdSubcontractVo = xzdSubcontract.queryById(vo.getContractId()); XzdSubcontractVo xzdSubcontractVo = xzdSubcontract.queryById(vo.getContractId());
if (xzdSubcontractVo != null){ if (xzdSubcontractVo != null){
List<XzdSubcontractVo> subcontractVo = List.of(xzdSubcontractVo);
// xzdContractDetailsService.setValue(xzdContractDetailsVo1);
xzdSubcontractVo = subcontractVo.getFirst();
//合同对象 //合同对象
vo.setContract(xzdSubcontractVo); vo.setContract(xzdSubcontractVo);
//合同编码 //合同编码
@ -339,12 +337,12 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
} }
} }
//收款单位 //收款单位
if (vo.getSkdwId() != null){ // if (vo.getSkdwId() != null){
XzdSupplierInfoVo xzdSupplierInfoVo = xzdSupplierInfoService.queryById(vo.getSkdwId()); // XzdSupplierInfo xzdSupplierInfoVo = xzdSupplierInfoService.getBaseMapper().selectById(vo.getSkdwId());
if (xzdSupplierInfoVo != null){ // if (xzdSupplierInfoVo != null){
vo.setSkdw(xzdSupplierInfoVo.getUnitName()); // vo.setSkdw(xzdSupplierInfoVo.getUnitName());
} // }
} // }
//收款单位银行 //收款单位银行
if (vo.getSkdwYhId() != null){ if (vo.getSkdwYhId() != null){
XzdSupplierOpenBankVo xzdSupplierOpenBankVo = xzdSupplierOpenBankService.queryById(vo.getSkdwYhId()); XzdSupplierOpenBankVo xzdSupplierOpenBankVo = xzdSupplierOpenBankService.queryById(vo.getSkdwYhId());
@ -354,7 +352,7 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
} }
//项目类型 //项目类型
if (vo.getXmlxId() != null){ if (vo.getXmlxId() != null){
XzdProjectTypeVo projectTypeVo = xzdProjectTypeService.queryById(vo.getXmlxId()); XzdProjectType projectTypeVo = xzdProjectTypeService.getBaseMapper().selectById(vo.getXmlxId());
if (projectTypeVo != null){ if (projectTypeVo != null){
vo.setXmlx(projectTypeVo.getTypeName()); vo.setXmlx(projectTypeVo.getTypeName());
} }

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java
View File

@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd; import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -140,6 +142,7 @@ public class XzdSpykpSjsqdVo implements Serializable {
/** /**
* 付款单位名称 * 付款单位名称
*/ */
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "fkdwId")
private String fkdwmc; private String fkdwmc;
/** /**

26
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
@ -18,9 +17,8 @@ import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.impl.SysDeptServiceImpl; import org.dromara.system.service.impl.SysDeptServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.domain.XzdContractDetails;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.XzdProject;
import org.dromara.xzd.domain.vo.XzdProjectVo;
import org.dromara.xzd.domain.vo.XzdSolutionSelectionVo; import org.dromara.xzd.domain.vo.XzdSolutionSelectionVo;
import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.IXzdCorrespondentList;
import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl; import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl;
@ -238,14 +236,14 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
} }
//项目名称 //项目名称
if (vo.getXmId() != null){ if (vo.getXmId() != null){
XzdProjectVo projectVo = xzdProjectService.queryById(vo.getXmId()); XzdProject projectVo = xzdProjectService.getBaseMapper().selectById(vo.getXmId());
if (projectVo != null){ if (projectVo != null){
vo.setXmmc(projectVo.getProjectName()); vo.setXmmc(projectVo.getProjectName());
} }
} }
//合同名称 //合同名称
if (vo.getHtId() != null){ if (vo.getHtId() != null){
XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getHtId()); XzdContractDetails xzdContractDetailsVo = xzdContractDetailsService.getBaseMapper().selectById(vo.getHtId());
if (xzdContractDetailsVo != null){ if (xzdContractDetailsVo != null){
vo.setHtmc(xzdContractDetailsVo.getContractName()); vo.setHtmc(xzdContractDetailsVo.getContractName());
//合同编号 //合同编号
@ -255,14 +253,14 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
} }
} }
//付款单位名称 //付款单位名称
if (vo.getFkdwId() != null){ // if (vo.getFkdwId() != null){
R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getFkdwId()); // R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getFkdwId());
if (byid2 != null) { // if (byid2 != null) {
if (byid2.getData().getXzdCustomerinformation() != null) { // if (byid2.getData().getXzdCustomerinformation() != null) {
vo.setFkdwmc(byid2.getData().getXzdCustomerinformation().getUnitName()); // vo.setFkdwmc(byid2.getData().getXzdCustomerinformation().getUnitName());
} // }
} // }
} // }
//类型名称 //类型名称
if (vo.getType() != null){ if (vo.getType() != null){
XzdSolutionSelectionVo solutionSelectionVo = xzdSolutionSelectionService.queryById(vo.getType()); XzdSolutionSelectionVo solutionSelectionVo = xzdSolutionSelectionService.queryById(vo.getType());