From e160cc5ff31490003c74de3453213da658ae0011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Thu, 27 Nov 2025 15:15:32 +0800 Subject: [PATCH] =?UTF-8?q?11-27-=E4=BF=AE=E6=94=B9=E6=89=BF=E5=8C=85?= =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/XzdContractAdvanceInfoBo.java | 11 +-- .../xzd/domain/bo/XzdContractClauseBo.java | 13 ++- .../xzd/domain/bo/XzdDeductionItemsBo.java | 8 +- .../impl/XzdContractDetailsServiceImpl.java | 86 +++++-------------- 4 files changed, 34 insertions(+), 84 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAdvanceInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAdvanceInfoBo.java index 102fca1a..d884d89d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAdvanceInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAdvanceInfoBo.java @@ -1,13 +1,10 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdContractAdvanceInfo; -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 lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdContractAdvanceInfo; import java.math.BigDecimal; @@ -30,13 +27,13 @@ public class XzdContractAdvanceInfoBo extends BaseEntity { /** * 表名 */ - @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class }) private String tableName; /** * 承包合同信息ID */ - @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long contractDetailsId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractClauseBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractClauseBo.java index 4187e421..ebb0132d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractClauseBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractClauseBo.java @@ -1,13 +1,10 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdContractClause; -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 lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdContractClause; /** * 合同条款-合同条款业务对象 xzd_contract_clause @@ -21,20 +18,20 @@ import jakarta.validation.constraints.*; public class XzdContractClauseBo extends BaseEntity { /** - * + * */ private Long id; /** * 表名 */ - @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class }) private String tableName; /** * 承包合同信息ID */ - @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long contractDetailsId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java index 6c64e72b..732bc161 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java @@ -1,12 +1,8 @@ package org.dromara.xzd.domain.bo; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -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.XzdDeductionItems; @@ -32,13 +28,13 @@ public class XzdDeductionItemsBo extends BaseEntity { /** * 表名 */ - @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class }) private String tableName; /** * 承包合同信息ID */ - @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long contractDetailsId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java index d06f3c20..dde1ca97 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java @@ -262,24 +262,6 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl old1 = List.of(old); -// setValue(old1); -// old = old1.getFirst(); - -// if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){ -// if (old.getSealInfo() != null && !old.getSealInfo().isEmpty()){ -// xzdBusinessChangeService.removeByIds(old.getSealInfo()); -// } -// for (XzdBusinessChange businessChange : bo.getSealInfo()) { -// businessChange.setContractChangeId(update.getId()); -// } -// xzdBusinessChangeService.saveBatch(bo.getSealInfo()); -// }else { -// if (old.getSealInfo() != null && !old.getSealInfo().isEmpty()){ -// xzdBusinessChangeService.removeByIds(old.getSealInfo()); -// } -// } - //合同文本-预收款项 if (bo.getYskx() != null && !bo.getYskx().isEmpty()){ if (old.getYskx() != null && !old.getYskx().isEmpty()){ @@ -297,15 +279,6 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); - for (Long l : oldFileId) { - if (!nowFileId.contains(l)) { - sysOssService.deleteWithValidByIds(List.of(l), false); - } - } - } - }else { - if (old.getFileId()!= null && !old.getFileId().isEmpty()){ - List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - sysOssService.deleteWithValidByIds(deleteIds, false); - } - } +// if (bo.getFileId() != null && !bo.getFileId().isEmpty()){ +// if (old.getFileId() != null && !old.getFileId().isEmpty()) { +// List oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); +// for (Long l : oldFileId) { +// if (!nowFileId.contains(l)) { +// sysOssService.deleteWithValidByIds(List.of(l), false); +// } +// } +// } +// }else { +// if (old.getFileId()!= null && !old.getFileId().isEmpty()){ +// List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// sysOssService.deleteWithValidByIds(deleteIds, false); +// } +// } validEntityBeforeSave(update);