From f2d4ff42371a71d3e1f2e4f160f9f0d982738f66 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 23 Oct 2025 15:04:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/XzdPurchaseContractInformationVo.java | 1 - .../org/dromara/xzd/service/impl/XzdCorrespondentListImp.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index a2d23a68..106a02e4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -239,7 +239,6 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 其他收入合同项目名称 */ @ExcelProperty(value = "其他收入合同项目名称") - @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "otherIncomeContractProject") private String otherIncomeContractProjectName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java index 63325eb9..d6cc0978 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java @@ -134,7 +134,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList { xzdCustomertypeInfoService.saveBatch(collect); for (XzdCustomertypeInfo customertypeInfo : collect) { - if (customertypeInfo.getPrimaryClass() == "1"){ + if (customertypeInfo.getPrimaryClass().equals("1")){ XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId()); if (xzdCustomertype != null){ customertype = xzdCustomertype.getCustomerType(); @@ -353,7 +353,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList { }).collect(Collectors.toList()); xzdCustomertypeInfoService.saveBatch(collect); for (XzdCustomertypeInfo customertypeInfo : collect) { - if (customertypeInfo.getPrimaryClass() == "1"){ + if (customertypeInfo.getPrimaryClass().equals("1")){ XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId()); if (xzdCustomertype != null){ customertype = xzdCustomertype.getCustomerType(); From 45ac1817e1f8139d26000d2ac5d376f74f865093 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 23 Oct 2025 16:08:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=90=E6=9C=AC=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/XzdCbysZjhcbAlterationBo.java | 7 ++--- .../domain/vo/XzdCbysZjhcbAlterationVo.java | 7 ++--- .../XzdCbysZjhcbAlterationServiceImpl.java | 27 +++++++++---------- .../xzd/domain/vo/XzdClienteleListVo.java | 8 ++++++ 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java index 082cca98..1900c3c0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java @@ -1,8 +1,6 @@ package org.dromara.xzd.costProjectApproval.costBudget.domain.bo; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysSscb; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZjhcbAlteration; +import org.dromara.xzd.costProjectApproval.costBudget.domain.*; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -10,7 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZtjhcbBgjl; import java.math.BigDecimal; import java.time.LocalDate; @@ -164,7 +161,7 @@ public class XzdCbysZjhcbAlterationBo extends BaseEntity { /** * 成本明细 */ - List xzdCbysWgcbtbFubiao; + List xzdCbysWgcbtbFubiao; /** * 税收成本 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java index 6409dd9f..c2d2a029 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java @@ -4,16 +4,13 @@ import java.math.BigDecimal; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysSscb; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZjhcbAlteration; +import org.dromara.xzd.costProjectApproval.costBudget.domain.*; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZtjhcbBgjl; import java.io.Serial; import java.io.Serializable; @@ -223,7 +220,7 @@ public class XzdCbysZjhcbAlterationVo implements Serializable { /** * 成本明细 */ - List xzdCbysWgcbtbFubiao; + List xzdCbysWgcbtbFubiao; /** * 税收成本 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java index 56fb6db0..7c9c3d36 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java @@ -13,21 +13,15 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.ISysUserService; import org.dromara.system.service.impl.SysOssServiceImpl; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysSscb; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZtjhcbBgjl; +import org.dromara.xzd.costProjectApproval.costBudget.domain.*; import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysSscbService; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysWgcbtbFubiaoService; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZtjhcbBgjlService; +import org.dromara.xzd.costProjectApproval.costBudget.service.*; import org.dromara.xzd.service.impl.XzdProjectServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbAlterationBo; import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbAlterationVo; -import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZjhcbAlteration; import org.dromara.xzd.costProjectApproval.costBudget.mapper.XzdCbysZjhcbAlterationMapper; -import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbAlterationService; import java.util.*; @@ -57,6 +51,9 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl xzdCbysSscbs = xzdCbysSscbService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdCbysSscb::getMainDocumentId, vo.getId())); vo.setXzdCbysSscb(xzdCbysSscbs); - List xzdCbysWgcbtbFubiaos = fubiaoService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdCbysWgcbtbFubiao::getMainDocId, vo.getId())); + + + List xzdCbysWgcbtbFubiaos = iXzdCbysZjhcbFubiaoService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdCbysZjhcbFubiao::getMainDocumentId, vo.getId())); vo.setXzdCbysWgcbtbFubiao(xzdCbysWgcbtbFubiaos); } private LambdaQueryWrapper buildQueryWrapper(XzdCbysZjhcbAlterationBo bo) { @@ -177,8 +176,8 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl {item.setMainDocumentId(add.getId());}); xzdCbysZtjhcbBgjlService.saveBatch(bo.getXzdCbysZtjhcbBgjl()); - bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocId(add.getId());}); - fubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao()); + bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocumentId(add.getId());}); + iXzdCbysZjhcbFubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao()); if (flag) { bo.setId(add.getId()); } @@ -206,13 +205,13 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl().eq(XzdCbysZtjhcbBgjl::getMainDocumentId, bo.getId())); xzdCbysSscbService.remove(new LambdaQueryWrapper().eq(XzdCbysSscb::getMainDocumentId, bo.getId())); - fubiaoService.remove(new LambdaQueryWrapper().eq(XzdCbysWgcbtbFubiao::getMainDocId, bo.getId())); + iXzdCbysZjhcbFubiaoService.remove(new LambdaQueryWrapper().eq(XzdCbysZjhcbFubiao::getMainDocumentId, bo.getId())); bo.getXzdCbysSscb().forEach(item -> {item.setMainDocumentId(bo.getId());}); xzdCbysSscbService.saveBatch(bo.getXzdCbysSscb()); bo.getXzdCbysZtjhcbBgjl().forEach(item -> {item.setMainDocumentId(bo.getId());}); xzdCbysZtjhcbBgjlService.saveBatch(bo.getXzdCbysZtjhcbBgjl()); - bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocId(bo.getId());}); - fubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao()); + bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocumentId(bo.getId());}); + iXzdCbysZjhcbFubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao()); return baseMapper.updateById(update) > 0; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdClienteleListVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdClienteleListVo.java index b4e6b865..b152aec4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdClienteleListVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdClienteleListVo.java @@ -6,6 +6,8 @@ import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.domain.bo.XzdCustomerDetailBo; import java.util.Date; @@ -61,6 +63,12 @@ public class XzdClienteleListVo { */ private Long createBy; + /** + * 创建者 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") + private String createByName; + /** * 创建时间 */ From 0d5a9eb505e7334e5de29d44361c16ba29d46089 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 23 Oct 2025 17:18:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bo/XzdPurchaseContractSuspendBo.java | 6 +++++ ...XzdPurchaseContractSuspendServiceImpl.java | 5 ++++ .../impl/XzdSubcontractServiceImpl.java | 3 +++ .../vo/XzdPurchaseContractInformationVo.java | 7 ++++++ ...urchaseContractInformationServiceImpl.java | 23 ++++++++++++++----- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java index 9c7e1cd0..bcd3ae55 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java @@ -129,4 +129,10 @@ public class XzdPurchaseContractSuspendBo extends BaseEntity { private String auditStatus; + private LocalDate startDate; + + + private LocalDate endDate; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java index 1aaffd0c..50da08db 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java @@ -150,6 +150,11 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl informationVo = List.of(xzdSubcontractVo); // 装填数据 setValue(informationVo); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index 106a02e4..0055c35e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -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; + /** * 项目责任人 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index 31680183..4a760515 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -410,6 +410,17 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl