From 1aa77e5eda93b58e2e0fea2a3aa08597791441a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 20 Oct 2025 19:26:08 +0800 Subject: [PATCH] =?UTF-8?q?10-20-=E5=86=B3=E7=AE=97=E6=B8=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/xzd/domain/XzdJsqdTz.java | 2 +- .../org/dromara/xzd/domain/XzdZbjghyd.java | 51 ++++++ .../xzd/domain/bo/XzdContractAccountBo.java | 24 +++ .../dromara/xzd/domain/bo/XzdJsqdTzBo.java | 4 +- .../bo/XzdWorkcontractCompletionAdjustBo.java | 17 ++ .../dromara/xzd/domain/bo/XzdZbjghydBo.java | 49 +++++ .../xzd/domain/vo/XzdContractAccountVo.java | 24 +++ .../dromara/xzd/domain/vo/XzdJsqdTzVo.java | 6 +- .../vo/XzdWorkcontractCompletionAdjustVo.java | 17 ++ .../dromara/xzd/domain/vo/XzdZbjghydVo.java | 58 ++++++ .../dromara/xzd/mapper/XzdZbjghydMapper.java | 15 ++ .../xzd/service/IXzdZbjghydService.java | 70 ++++++++ .../impl/XzdContractAccountServiceImpl.java | 170 ++++++++++++++++++ ...ContractProgressSettlementServiceImpl.java | 26 ++- .../service/impl/XzdJsqdTzServiceImpl.java | 2 +- ...rkcontractCompletionAdjustServiceImpl.java | 120 +++++++++++++ .../service/impl/XzdZbjghydServiceImpl.java | 132 ++++++++++++++ .../domain/XzdAlterationInventory.java | 5 + .../domain/XzdContractInventory.java | 6 +- .../domain/bo/XzdAlterationInventoryBo.java | 5 + .../domain/bo/XzdContractInventoryBo.java | 5 +- .../domain/vo/XzdAlterationInventoryVo.java | 5 + .../domain/vo/XzdContractInventoryVo.java | 5 +- 23 files changed, 799 insertions(+), 19 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdZbjghydMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdZbjghydService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdZbjghydServiceImpl.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java index 0082d98a..ba3e2f93 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java @@ -131,7 +131,7 @@ public class XzdJsqdTz extends BaseEntity { /** * wbs */ - private String wbs; + private String tzhwbs; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java new file mode 100644 index 00000000..93342df3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java @@ -0,0 +1,51 @@ +package org.dromara.xzd.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 质保金归还约定对象 xzd_zbjghyd + * + * @author Lion Li + * @date 2025-10-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xzd_zbjghyd") +public class XzdZbjghyd extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 关联id + */ + private Long mainId; + + /** + * 质保期(月份) + */ + private Long zbq; + + /** + * 归还比例 + */ + private Long ghbl; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java index a83b8aef..9d3d942c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java @@ -10,10 +10,14 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.xzd.domain.XzdZbjghyd; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 承包合同竣工结算业务对象 xzd_contract_account @@ -168,4 +172,24 @@ public class XzdContractAccountBo extends BaseEntity { private String fileId; + /** + * 决算清单 + */ + private List jsqd; + + /** + * 奖励与扣款-奖励 + */ + private List jl; + + /** + * 奖励与扣款-扣款 + */ + private List kk; + + /** + * 质保金归还约定 + */ + private List zbjghyd; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java index ec376e1f..a647ff76 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java @@ -125,9 +125,9 @@ public class XzdJsqdTzBo extends BaseEntity { private String ywbs; /** - * wbs + * 调整后wbs */ - private String wbs; + private String tzhwbs; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java index 1bac10f9..aa5b5ae3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java @@ -1,6 +1,7 @@ package org.dromara.xzd.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -9,10 +10,12 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 承包合同竣工结算调整业务对象 xzd_workcontract_completion_adjust @@ -116,5 +119,19 @@ public class XzdWorkcontractCompletionAdjustBo extends BaseEntity { */ private Long danjuId; + /** + * 决算清单调整 + */ + private List jsqdTz; + + /** + * 奖励与扣款-扣款 + */ + private List kk; + + /** + * 奖励与扣款-奖励 + */ + private List jl; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java new file mode 100644 index 00000000..7066cbe4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java @@ -0,0 +1,49 @@ +package org.dromara.xzd.domain.bo; + +import org.dromara.xzd.domain.XzdZbjghyd; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 质保金归还约定业务对象 xzd_zbjghyd + * + * @author Lion Li + * @date 2025-10-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = XzdZbjghyd.class, reverseConvertGenerate = false) +public class XzdZbjghydBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 关联id + */ + private Long mainId; + + /** + * 质保期(月份) + */ + private Long zbq; + + /** + * 归还比例 + */ + private Long ghbl; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java index 65840d34..a19fa611 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java @@ -9,11 +9,15 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdSettlementRules; +import org.dromara.xzd.domain.XzdZbjghyd; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** @@ -214,4 +218,24 @@ public class XzdContractAccountVo implements Serializable { private String fileId; + /** + * 决算清单 + */ + private List jsqd; + + /** + * 奖励与扣款-奖励 + */ + private List jl; + + /** + * 奖励与扣款-扣款 + */ + private List kk; + + /** + * 质保金归还约定 + */ + private List zbjghyd; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java index 227156b2..f7753eba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java @@ -152,10 +152,10 @@ public class XzdJsqdTzVo implements Serializable { private String ywbs; /** - * wbs + * 调整后wbs */ - @ExcelProperty(value = "wbs") - private String wbs; + @ExcelProperty(value = "调整后wbs") + private String tzhwbs; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java index e765d037..dda1e543 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java @@ -5,6 +5,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.xzd.domain.XzdContractAccount; +import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -12,10 +13,12 @@ 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.settlement.domain.XzdJsDeductionItems; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** @@ -140,5 +143,19 @@ public class XzdWorkcontractCompletionAdjustVo implements Serializable { @ExcelProperty(value = "单据引用ID") private Long danjuId; + /** + * 决算清单调整 + */ + private List jsqdTz; + + /** + * 奖励与扣款-扣款 + */ + private List kk; + + /** + * 奖励与扣款-奖励 + */ + private List jl; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java new file mode 100644 index 00000000..881bb31f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java @@ -0,0 +1,58 @@ +package org.dromara.xzd.domain.vo; + +import org.dromara.xzd.domain.XzdZbjghyd; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 质保金归还约定视图对象 xzd_zbjghyd + * + * @author Lion Li + * @date 2025-10-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XzdZbjghyd.class) +public class XzdZbjghydVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 关联id + */ + @ExcelProperty(value = "关联id") + private Long mainId; + + /** + * 质保期(月份) + */ + @ExcelProperty(value = "质保期(月份)") + private Long zbq; + + /** + * 归还比例 + */ + @ExcelProperty(value = "归还比例") + private Long ghbl; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdZbjghydMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdZbjghydMapper.java new file mode 100644 index 00000000..5906cefa --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdZbjghydMapper.java @@ -0,0 +1,15 @@ +package org.dromara.xzd.mapper; + +import org.dromara.xzd.domain.XzdZbjghyd; +import org.dromara.xzd.domain.vo.XzdZbjghydVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 质保金归还约定Mapper接口 + * + * @author Lion Li + * @date 2025-10-20 + */ +public interface XzdZbjghydMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdZbjghydService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdZbjghydService.java new file mode 100644 index 00000000..840ef8dd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdZbjghydService.java @@ -0,0 +1,70 @@ +package org.dromara.xzd.service; + +import org.dromara.xzd.domain.vo.XzdZbjghydVo; +import org.dromara.xzd.domain.bo.XzdZbjghydBo; +import org.dromara.xzd.domain.XzdZbjghyd; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 质保金归还约定Service接口 + * + * @author Lion Li + * @date 2025-10-20 + */ +public interface IXzdZbjghydService extends IService{ + + /** + * 查询质保金归还约定 + * + * @param id 主键 + * @return 质保金归还约定 + */ + XzdZbjghydVo queryById(Long id); + + /** + * 分页查询质保金归还约定列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 质保金归还约定分页列表 + */ + TableDataInfo queryPageList(XzdZbjghydBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的质保金归还约定列表 + * + * @param bo 查询条件 + * @return 质保金归还约定列表 + */ + List queryList(XzdZbjghydBo bo); + + /** + * 新增质保金归还约定 + * + * @param bo 质保金归还约定 + * @return 是否新增成功 + */ + Boolean insertByBo(XzdZbjghydBo bo); + + /** + * 修改质保金归还约定 + * + * @param bo 质保金归还约定 + * @return 是否修改成功 + */ + Boolean updateByBo(XzdZbjghydBo bo); + + /** + * 校验并批量删除质保金归还约定信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java index d9ee9e42..5bcf7704 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java @@ -14,11 +14,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdSettlementRules; +import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdSettlementRulesVo; 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.service.impl.XzdJsDeductionItemsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.xzd.domain.bo.XzdContractAccountBo; @@ -51,6 +56,12 @@ public class XzdContractAccountServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(XzdJsDeductionItems::getMainDocId, id); + queryWrapper.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account"); + xzdJsDeductionItemsService.remove(queryWrapper); + + //结算清单 + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(XzdJsqdTz::getMainId, id); + queryWrapper1.eq(XzdJsqdTz::getType, "1"); + xzdJsqdTzService.remove(queryWrapper1); + + //质保金归还约定 + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(XzdZbjghyd::getMainId, id); + xzdZbjghydService.remove(queryWrapper2); + } + return baseMapper.deleteByIds(ids) > 0; } @@ -256,6 +393,39 @@ public class XzdContractAccountServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(XzdJsqdTz::getMainId, vo.getId()); + queryWrapper.eq(XzdJsqdTz::getType, "1"); + List jsqdTzs = xzdJsqdTzService.list(queryWrapper); + if (jsqdTzs != null && !jsqdTzs.isEmpty()){ + vo.setJsqd(jsqdTzs); + } + //扣款与奖励-扣款 + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account"); + queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 1L); + List xzdJsDeductionItems = xzdJsDeductionItemsService.list(queryWrapper1); + if (xzdJsDeductionItems != null && !xzdJsDeductionItems.isEmpty()){ + vo.setKk(xzdJsDeductionItems); + } + //扣款与奖励-奖励 + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account"); + queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 2L); + List xzdJsDeductionItems1 = xzdJsDeductionItemsService.list(queryWrapper2); + if (xzdJsDeductionItems1 != null && !xzdJsDeductionItems1.isEmpty()){ + vo.setJl(xzdJsDeductionItems1); + } + //质保金归还约定 + LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); + queryWrapper3.eq(XzdZbjghyd::getMainId, vo.getId()); + List xzdZbjghyds = xzdZbjghydService.list(queryWrapper3); + if (xzdZbjghyds != null && !xzdZbjghyds.isEmpty()){ + vo.setZbjghyd(xzdZbjghyds); + } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java index a6022bcb..a000aab9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java @@ -190,7 +190,7 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl lqw1 = new LambdaQueryWrapper<>(); lqw1.eq(XzdContractInventory::getPrimaryMeterId, id); - lqw1.eq(XzdContractInventory::getType, "合同内清单"); + lqw1.eq(XzdContractInventory::getType, "2"); xzdContractInventoryService.remove(lqw1); LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); @@ -404,7 +414,7 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl lqw3 = new LambdaQueryWrapper<>(); lqw3.eq(XzdContractInventory::getPrimaryMeterId, id); - lqw3.eq(XzdContractInventory::getType, "合同外清单"); + lqw3.eq(XzdContractInventory::getType, "1"); xzdContractInventoryService.remove(lqw3); //奖励与扣款-扣款 @@ -496,7 +506,7 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(XzdContractInventory::getPrimaryMeterId, vo.getId()); - queryWrapper1.eq(XzdContractInventory::getType, "合同内清单"); + queryWrapper1.eq(XzdContractInventory::getType, "2"); List list1 = xzdContractInventoryService.list(queryWrapper1); if (list1 != null){ vo.setHtnqd(list1); @@ -511,7 +521,7 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl queryWrapper3 = new LambdaQueryWrapper<>(); queryWrapper3.eq(XzdContractInventory::getPrimaryMeterId, vo.getId()); - queryWrapper3.eq(XzdContractInventory::getType, "合同外清单"); + queryWrapper3.eq(XzdContractInventory::getType, "1"); List list3 = xzdContractInventoryService.list(queryWrapper3); if (list3 != null){ vo.setHtwqd(list3); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java index cbbddcdf..ca22d6c5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java @@ -93,7 +93,7 @@ public class XzdJsqdTzServiceImpl extends ServiceImpl 0; } @@ -195,6 +272,23 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(XzdJsqdTz::getMainId, id); + queryWrapper.eq(XzdJsqdTz::getType, "2"); + xzdJsqdTzService.remove(queryWrapper); + //删除奖励与扣款-奖励 + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, id); + queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 2L); + queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust"); + xzdJsDeductionItemsService.remove(queryWrapper1); + //删除奖励与扣款-扣款 + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, id); + queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 1L); + queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust"); + xzdJsDeductionItemsService.remove(queryWrapper2); } } return baseMapper.deleteByIds(ids) > 0; @@ -233,6 +327,32 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(XzdJsqdTz::getMainId, vo.getId()); + queryWrapper.eq(XzdJsqdTz::getType, "2"); + List jsqdTzs = xzdJsqdTzService.list(queryWrapper); + if (jsqdTzs != null && !jsqdTzs.isEmpty()){ + vo.setJsqdTz(jsqdTzs); + } + //奖励与扣款-奖励 + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 2L); + queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust"); + List jl = xzdJsDeductionItemsService.list(queryWrapper1); + if (jl != null && !jl.isEmpty()){ + vo.setJl(jl); + } + //奖励与扣款-扣款 + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 1L); + queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust"); + List kk = xzdJsDeductionItemsService.list(queryWrapper2); + if (kk != null && !kk.isEmpty()){ + vo.setKk(kk); + } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdZbjghydServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdZbjghydServiceImpl.java new file mode 100644 index 00000000..217e6d5e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdZbjghydServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.xzd.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +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.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.xzd.domain.bo.XzdZbjghydBo; +import org.dromara.xzd.domain.vo.XzdZbjghydVo; +import org.dromara.xzd.domain.XzdZbjghyd; +import org.dromara.xzd.mapper.XzdZbjghydMapper; +import org.dromara.xzd.service.IXzdZbjghydService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 质保金归还约定Service业务层处理 + * + * @author Lion Li + * @date 2025-10-20 + */ +@RequiredArgsConstructor +@Service +public class XzdZbjghydServiceImpl extends ServiceImpl implements IXzdZbjghydService { + + private final XzdZbjghydMapper baseMapper; + + /** + * 查询质保金归还约定 + * + * @param id 主键 + * @return 质保金归还约定 + */ + @Override + public XzdZbjghydVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询质保金归还约定列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 质保金归还约定分页列表 + */ + @Override + public TableDataInfo queryPageList(XzdZbjghydBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的质保金归还约定列表 + * + * @param bo 查询条件 + * @return 质保金归还约定列表 + */ + @Override + public List queryList(XzdZbjghydBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(XzdZbjghydBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(XzdZbjghyd::getId); + lqw.eq(bo.getMainId() != null, XzdZbjghyd::getMainId, bo.getMainId()); + lqw.eq(bo.getZbq() != null, XzdZbjghyd::getZbq, bo.getZbq()); + lqw.eq(bo.getGhbl() != null, XzdZbjghyd::getGhbl, bo.getGhbl()); + return lqw; + } + + /** + * 新增质保金归还约定 + * + * @param bo 质保金归还约定 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(XzdZbjghydBo bo) { + XzdZbjghyd add = MapstructUtils.convert(bo, XzdZbjghyd.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改质保金归还约定 + * + * @param bo 质保金归还约定 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(XzdZbjghydBo bo) { + XzdZbjghyd update = MapstructUtils.convert(bo, XzdZbjghyd.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(XzdZbjghyd entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除质保金归还约定信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java index 131cbeaf..ed715f62 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java @@ -130,6 +130,11 @@ public class XzdAlterationInventory extends BaseEntity { */ private BigDecimal cumulativeSettlementAmount; + /** + * 累计结算占合同比 + */ + private BigDecimal ljjszhtb; + /** * CBS */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdContractInventory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdContractInventory.java index f73a8c75..d4a9fc2f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdContractInventory.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdContractInventory.java @@ -185,7 +185,9 @@ public class XzdContractInventory extends BaseEntity { */ private String auditStatus; - - + /** + * 数据来源 + */ + private String sjly; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java index c2458554..510bf1fc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java @@ -129,6 +129,11 @@ public class XzdAlterationInventoryBo extends BaseEntity { */ private BigDecimal cumulativeSettlementAmount; + /** + * 累计结算占合同比 + */ + private BigDecimal ljjszhtb; + /** * CBS */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdContractInventoryBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdContractInventoryBo.java index 418c4fc6..8c05bb20 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdContractInventoryBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdContractInventoryBo.java @@ -184,6 +184,9 @@ public class XzdContractInventoryBo extends BaseEntity { */ private String auditStatus; - + /** + * 数据来源 + */ + private String sjly; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java index 00b346e4..842d45cc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java @@ -154,6 +154,11 @@ public class XzdAlterationInventoryVo implements Serializable { @ExcelProperty(value = "累计结算金额") private BigDecimal cumulativeSettlementAmount; + /** + * 累计结算占合同比 + */ + private BigDecimal ljjszhtb; + /** * CBS */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdContractInventoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdContractInventoryVo.java index 05fb8a68..179afb7b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdContractInventoryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdContractInventoryVo.java @@ -224,6 +224,9 @@ public class XzdContractInventoryVo implements Serializable { @ExcelProperty(value = "审核状态") private String auditStatus; - + /** + * 数据来源 + */ + private String sjly; }