From 40e57b18cb10fe01f2c9adbdb29715a5c31da325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Fri, 24 Oct 2025 20:05:45 +0800 Subject: [PATCH] =?UTF-8?q?10-24-=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/XzdContractProgressSettlement.java | 11 +- .../xzd/domain/XzdContractTermination.java | 5 + .../bo/XzdContractProgressSettlementBo.java | 16 +-- .../domain/bo/XzdContractTerminationBo.java | 5 + .../vo/XzdContractProgressSettlementVo.java | 13 +- .../domain/vo/XzdContractTerminationVo.java | 5 + .../impl/XzdContractChangeServiceImpl.java | 1 + .../impl/XzdContractDetailsServiceImpl.java | 1 + ...ContractProgressSettlementServiceImpl.java | 44 +++--- .../XzdContractTerminationServiceImpl.java | 1 + .../impl/XzdSupplierInfoServiceImpl.java | 134 ++++++++++-------- ...rkcontractCompletionAdjustServiceImpl.java | 2 +- .../sjsqd/domain/vo/XzdSpykpSjsqdVo.java | 18 +-- .../impl/XzdSpykpSjsqdServiceImpl.java | 2 + 14 files changed, 147 insertions(+), 111 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java index 836dcea5..e6fdb9a8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java @@ -1,16 +1,15 @@ package org.dromara.xzd.domain; -import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; - import java.io.Serial; +import java.util.Date; /** * 承包合同进度结算对象 xzd_contract_progress_settlement @@ -92,7 +91,7 @@ public class XzdContractProgressSettlement extends BaseEntity { /** * 统计周期 */ - private Long contractProgressId; + private String contractProgressId; /** * 计量开始日期 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java index 5cf9a52c..a705bdd2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java @@ -32,6 +32,11 @@ public class XzdContractTermination extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 部门id + */ + private Long deptId; + /** * 单据编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java index 07f8e7f8..8ac97096 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java @@ -1,16 +1,16 @@ package org.dromara.xzd.domain.bo; -import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdBusinessChange; -import org.dromara.xzd.domain.XzdContractProgressSettlement; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdBusinessChange; +import org.dromara.xzd.domain.XzdContractProgressSettlement; import org.dromara.xzd.settlement.domain.XzdAlterationInventory; import org.dromara.xzd.settlement.domain.XzdContractInventory; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; @@ -105,7 +105,7 @@ public class XzdContractProgressSettlementBo extends BaseEntity { /** * 统计周期 */ - private Long contractProgressId; + private String contractProgressId; /** * 计量开始日期 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java index b06f28a1..0c7223b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java @@ -31,6 +31,11 @@ public class XzdContractTerminationBo extends BaseEntity { */ private Long id; + /** + * 部门id + */ + private Long deptId; + /** * 单据编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java index 0697bf44..003a7a84 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java @@ -1,15 +1,12 @@ 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.XzdBusinessChange; -import org.dromara.xzd.domain.XzdContractProgressSettlement; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdBusinessChange; +import org.dromara.xzd.domain.XzdContractProgressSettlement; import org.dromara.xzd.settlement.domain.XzdAlterationInventory; import org.dromara.xzd.settlement.domain.XzdContractInventory; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; @@ -17,6 +14,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; @@ -127,7 +126,7 @@ public class XzdContractProgressSettlementVo implements Serializable { * 统计周期 */ @ExcelProperty(value = "统计周期") - private Long contractProgressId; + private String contractProgressId; /** * 统计周期名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java index e8062b05..32bc25b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java @@ -36,6 +36,11 @@ public class XzdContractTerminationVo implements Serializable { @ExcelProperty(value = "") private Long id; + /** + * 部门id + */ + private Long deptId; + /** * 单据编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java index b78657a1..a9614a22 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java @@ -151,6 +151,7 @@ public class XzdContractChangeServiceImpl extends ServiceImpl contractVo1 = List.of(contractVo); - xzdContractDetailsService.setValue(contractVo1); - contractVo = contractVo1.getFirst(); +// List contractVo1 = List.of(contractVo); +// xzdContractDetailsService.setValue(contractVo1); +// contractVo = contractVo1.getFirst(); vo.setContractName(contractVo.getContractName()); //合同编码 vo.setContractCode(contractVo.getContractCode()); //项目名称 vo.setProjectName(contractVo.getProjectName()); + //项目id + vo.setProjectId(contractVo.getProject()); //合同金额 vo.setContractAmount(contractVo.getContractAmount()); //单据日期 @@ -472,12 +470,12 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl byid = iXzdCorrespondentList.getCustomerByid(vo.getSettlementUnit()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java index b0fbd194..ea96a021 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java @@ -94,6 +94,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl nowFile = new ArrayList<>(); - List oldFile = new ArrayList<>(); - for (XzdSupplierQualification businessChange : bo.getQualifications()) { - businessChange.setSupplierId(update.getId()); - for (String s : businessChange.getFileId().split(",")) { - nowFile.add(Long.valueOf(s)); - } - } - for (XzdSupplierQualification qualification : old.getQualifications()) { - if (qualification.getFileId() != null){ - String[] split = qualification.getFileId().split(","); - List fileIdList = Arrays.stream(split) - .map(Long::valueOf) - .toList(); - oldFile.addAll(fileIdList); - } - } - for (Long l : oldFile) { - if (!nowFile.contains(l)) { - sysOssService.deleteWithValidByIds(List.of(l), false); - } + for (XzdSupplierQualification qualification : bo.getQualifications()) { + qualification.setSupplierId(update.getId()); } xzdSupplierQualificationService.saveBatch(bo.getQualifications()); }else { if (old.getQualifications() != null && !old.getQualifications().isEmpty()){ - //删除绑定的文件 - for (XzdSupplierQualification qualification : old.getQualifications()) { - if (qualification.getFileId() != null){ - String[] split = qualification.getFileId().split(","); - List fileIdList = Arrays.stream(split) - .map(Long::valueOf) - .collect(Collectors.toList()); - sysOssService.deleteWithValidByIds(fileIdList, false); - } - } xzdSupplierQualificationService.removeByIds(old.getQualifications()); } } @@ -396,30 +366,51 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl xzdCustomertypeInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); - xzdCustomertypeInfoLambdaQueryWrapper.eq(XzdCustomertypeInfo::getType,"2"); - xzdCustomertypeInfoLambdaQueryWrapper.eq(XzdCustomertypeInfo::getCustomerinformationId, update.getId()); - xzdCustomertypeInfoService.remove(xzdCustomertypeInfoLambdaQueryWrapper); - + if (old.getCustomerTypes() != null && !old.getCustomerTypes().isEmpty()){ + xzdCustomertypeInfoService.removeByIds(old.getCustomerTypes()); + } for (XzdCustomertypeInfo customerType : bo.getCustomerTypes()) { customerType.setType("2"); customerType.setCustomerinformationId(update.getId()); } xzdCustomertypeInfoService.saveBatch(bo.getCustomerTypes()); + }else { + if (old.getCustomerTypes() != null && !old.getCustomerTypes().isEmpty()){ + xzdCustomertypeInfoService.removeByIds(old.getCustomerTypes()); + } } //处理供应物料 - if (bo.getMaterials()!= null && !bo.getMaterials().isEmpty()){ - for (XzdSupplyMaterials material : bo.getMaterials()) { - material.setSupplierId(update.getId()); + if (bo.getMaterials() != null && !bo.getMaterials().isEmpty()){ + if (old.getMaterials() != null && !old.getMaterials().isEmpty()){ + xzdSupplyMaterialsService.removeByIds(old.getMaterials()); + } + for (XzdSupplyMaterials customerType : bo.getMaterials()) { + customerType.setSupplierId(update.getId()); + } + xzdSupplyMaterialsService.saveBatch(bo.getMaterials()); + }else { + if (old.getMaterials() != null && !old.getMaterials().isEmpty()){ + xzdSupplyMaterialsService.removeByIds(old.getMaterials()); } - xzdSupplyMaterialsService.saveOrUpdateBatch(bo.getMaterials()); } //供应商评价 - if (bo.getEvaluations()!= null && !bo.getEvaluations().isEmpty()){ - for (XzdSupplierEvaluation evaluation : bo.getEvaluations()) { - evaluation.setSupplierId(update.getId()); + if (bo.getEvaluations() != null && !bo.getEvaluations().isEmpty()){ + if (old.getEvaluations() != null && !old.getEvaluations().isEmpty()){ + xzdSupplierEvaluationService.removeByIds(old.getEvaluations()); + } + for (XzdSupplierEvaluation customerType : bo.getEvaluations()) { + customerType.setSupplierId(update.getId()); + } + xzdSupplierEvaluationService.saveBatch(bo.getEvaluations()); + }else { + if (old.getEvaluations() != null && !old.getEvaluations().isEmpty()){ + xzdSupplierEvaluationService.removeByIds(old.getEvaluations()); } - xzdSupplierEvaluationService.saveOrUpdateBatch(bo.getEvaluations()); } //项目信息 - if (bo.getProjects()!= null && !bo.getProjects().isEmpty()){ + if (bo.getProjects() != null && !bo.getProjects().isEmpty()){ + if (old.getProjects() != null && !old.getProjects().isEmpty()){ + xzdProjectInfoService.removeByIds(old.getProjects()); + } for (XzdProjectInfo project : bo.getProjects()) { project.setCustomerinformationId(update.getId()); project.setType("2"); } - xzdProjectInfoService.saveOrUpdateBatch(bo.getProjects()); + xzdProjectInfoService.saveBatch(bo.getProjects()); + }else { + if (old.getProjects() != null && !old.getProjects().isEmpty()){ + xzdProjectInfoService.removeByIds(old.getProjects()); + } } + //合同信息 - if (bo.getContracts()!= null && !bo.getContracts().isEmpty()){ + if (bo.getContracts() != null && !bo.getContracts().isEmpty()){ + if (old.getContracts() != null && !old.getContracts().isEmpty()){ + xzdContractInfoService.removeByIds(old.getContracts()); + } for (XzdContractInfo contract : bo.getContracts()) { contract.setType("2"); contract.setCustomerinformationId(update.getId()); } - xzdContractInfoService.saveOrUpdateBatch(bo.getContracts()); + xzdContractInfoService.saveBatch(bo.getContracts()); + }else { + if (old.getContracts() != null && !old.getContracts().isEmpty()){ + xzdContractInfoService.removeByIds(old.getContracts()); + } } return b; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java index 71013178..9f2c7462 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java @@ -314,7 +314,7 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl