10-12-支付条款新增

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractClause.java

@@ -0,0 +1,56 @@
+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_contract_clause
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xzd_contract_clause")
+public class XzdContractClause extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 承包合同信息ID
+     */
+    private Long contractDetailsId;
+
+    /**
+     * 合同条款
+     */
+    private String contractClause;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 变更内容
+     */
+    private String changeContent;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementRules.java

@@ -0,0 +1,91 @@
+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_settlement_rules
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xzd_settlement_rules")
+public class XzdSettlementRules extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 承包合同信息ID
+     */
+    private Long contractDetailsId;
+
+    /**
+     * 类型（1结算 2决算 3预收款）
+     */
+    private String type;
+
+    /**
+     * 结算周期（1施工节点 2月）
+     */
+    private String settlementCycle;
+
+    /**
+     * 结算账龄(天)
+     */
+    private Long settlementAging;
+
+    /**
+     * 里程碑节点
+     */
+    private String milestoneNode;
+
+    /**
+     * 选择值（1合同金额 2本期结算金额 3累计结算金额 4累计结算百分比）
+     */
+    private String selectValue;
+
+    /**
+     * 比较符
+     */
+    private String comparisonSymbol;
+
+    /**
+     * 比较值
+     */
+    private String comparisonValue;
+
+    /**
+     * 收款账龄(天)
+     */
+    private Long collectionAging;
+
+    /**
+     * 收款基数(1合同金额 2本期结算金额)
+     */
+    private Long collectionBase;
+
+    /**
+     * 收款比例(%)
+     */
+    private Long collectionRatio;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractClauseBo.java

@@ -0,0 +1,56 @@
+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.*;
+
+/**
+ * 合同条款-合同条款业务对象 xzd_contract_clause
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XzdContractClause.class, reverseConvertGenerate = false)
+public class XzdContractClauseBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 表名
+     */
+    @NotBlank(message = "表名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tableName;
+
+    /**
+     * 承包合同信息ID
+     */
+    @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long contractDetailsId;
+
+    /**
+     * 合同条款
+     */
+    private String contractClause;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 变更内容
+     */
+    private String changeContent;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java

@@ -1,7 +1,6 @@
 package org.dromara.xzd.domain.bo;
 
-import org.dromara.xzd.domain.XzdContractAdvanceInfo;
+import org.dromara.xzd.domain.*;
-import org.dromara.xzd.domain.XzdContractDetails;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import org.dromara.xzd.domain.XzdDeductionItems;
 
 import java.util.Date;
 import java.util.List;
@@ -237,4 +235,14 @@ public class XzdContractDetailsBo extends BaseEntity {
      */
     private List<XzdDeductionItems> kkyjlx;
 
+    /**
+     * 合同条款
+     */
+    private List<XzdContractClause> httk;
+
+    /**
+     * 支付条款
+     */
+    private List<XzdSettlementRules> zftk;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSettlementRulesBo.java

@@ -0,0 +1,90 @@
+package org.dromara.xzd.domain.bo;
+
+import org.dromara.xzd.domain.XzdSettlementRules;
+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.*;
+
+/**
+ * 支付条款业务对象 xzd_settlement_rules
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XzdSettlementRules.class, reverseConvertGenerate = false)
+public class XzdSettlementRulesBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 承包合同信息ID
+     */
+    @NotNull(message = "承包合同信息ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long contractDetailsId;
+
+    /**
+     * 类型（1结算 2决算 3预收款）
+     */
+    private String type;
+
+    /**
+     * 结算周期（1施工节点 2月）
+     */
+    private String settlementCycle;
+
+    /**
+     * 结算账龄(天)
+     */
+    private Long settlementAging;
+
+    /**
+     * 里程碑节点
+     */
+    private String milestoneNode;
+
+    /**
+     * 选择值（1合同金额 2本期结算金额 3累计结算金额 4累计结算百分比）
+     */
+    private String selectValue;
+
+    /**
+     * 比较符
+     */
+    private String comparisonSymbol;
+
+    /**
+     * 比较值
+     */
+    private String comparisonValue;
+
+    /**
+     * 收款账龄(天)
+     */
+    private Long collectionAging;
+
+    /**
+     * 收款基数(1合同金额 2本期结算金额)
+     */
+    private Long collectionBase;
+
+    /**
+     * 收款比例(%)
+     */
+    private Long collectionRatio;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractClauseVo.java

@@ -0,0 +1,64 @@
+package org.dromara.xzd.domain.vo;
+
+import org.dromara.xzd.domain.XzdContractClause;
+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_contract_clause
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XzdContractClause.class)
+public class XzdContractClauseVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 表名
+     */
+    @ExcelProperty(value = "表名")
+    private String tableName;
+
+    /**
+     * 承包合同信息ID
+     */
+    @ExcelProperty(value = "承包合同信息ID")
+    private Long contractDetailsId;
+
+    /**
+     * 合同条款
+     */
+    @ExcelProperty(value = "合同条款")
+    private String contractClause;
+
+    /**
+     * 内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 变更内容
+     */
+    @ExcelProperty(value = "变更内容")
+    private String changeContent;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementRulesVo.java

@@ -0,0 +1,111 @@
+package org.dromara.xzd.domain.vo;
+
+import org.dromara.xzd.domain.XzdSettlementRules;
+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 java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 支付条款视图对象 xzd_settlement_rules
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XzdSettlementRules.class)
+public class XzdSettlementRulesVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 承包合同信息ID
+     */
+    @ExcelProperty(value = "承包合同信息ID")
+    private Long contractDetailsId;
+
+    /**
+     * 类型（1结算 2决算 3预收款）
+     */
+    @ExcelProperty(value = "类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=结算,2=决算,3=预收款")
+    private String type;
+
+    /**
+     * 结算周期（1施工节点 2月）
+     */
+    @ExcelProperty(value = "结算周期", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=施工节点,2=月")
+    private String settlementCycle;
+
+    /**
+     * 结算账龄(天)
+     */
+    @ExcelProperty(value = "结算账龄(天)")
+    private Long settlementAging;
+
+    /**
+     * 里程碑节点
+     */
+    @ExcelProperty(value = "里程碑节点")
+    private String milestoneNode;
+
+    /**
+     * 选择值（1合同金额 2本期结算金额 3累计结算金额 4累计结算百分比）
+     */
+    @ExcelProperty(value = "选择值", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=合同金额,2=本期结算金额,3=累计结算金额,4=累计结算百分比")
+    private String selectValue;
+
+    /**
+     * 比较符
+     */
+    @ExcelProperty(value = "比较符")
+    private String comparisonSymbol;
+
+    /**
+     * 比较值
+     */
+    @ExcelProperty(value = "比较值")
+    private String comparisonValue;
+
+    /**
+     * 收款账龄(天)
+     */
+    @ExcelProperty(value = "收款账龄(天)")
+    private Long collectionAging;
+
+    /**
+     * 收款基数(1合同金额 2本期结算金额)
+     */
+    @ExcelProperty(value = "收款基数(1合同金额 2本期结算金额)")
+    private Long collectionBase;
+
+    /**
+     * 收款比例(%)
+     */
+    @ExcelProperty(value = "收款比例(%)")
+    private Long collectionRatio;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractClauseMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.xzd.mapper;
+
+import org.dromara.xzd.domain.XzdContractClause;
+import org.dromara.xzd.domain.vo.XzdContractClauseVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 合同条款-合同条款Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+public interface XzdContractClauseMapper extends BaseMapperPlus<XzdContractClause, XzdContractClauseVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSettlementRulesMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.xzd.mapper;
+
+import org.dromara.xzd.domain.XzdSettlementRules;
+import org.dromara.xzd.domain.vo.XzdSettlementRulesVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 支付条款Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+public interface XzdSettlementRulesMapper extends BaseMapperPlus<XzdSettlementRules, XzdSettlementRulesVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdContractClauseService.java

@@ -0,0 +1,70 @@
+package org.dromara.xzd.service;
+
+import org.dromara.xzd.domain.vo.XzdContractClauseVo;
+import org.dromara.xzd.domain.bo.XzdContractClauseBo;
+import org.dromara.xzd.domain.XzdContractClause;
+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-12
+ */
+public interface IXzdContractClauseService extends IService<XzdContractClause>{
+
+    /**
+     * 查询合同条款-合同条款
+     *
+     * @param id 主键
+     * @return 合同条款-合同条款
+     */
+    XzdContractClauseVo queryById(Long id);
+
+    /**
+     * 分页查询合同条款-合同条款列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同条款-合同条款分页列表
+     */
+    TableDataInfo<XzdContractClauseVo> queryPageList(XzdContractClauseBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的合同条款-合同条款列表
+     *
+     * @param bo 查询条件
+     * @return 合同条款-合同条款列表
+     */
+    List<XzdContractClauseVo> queryList(XzdContractClauseBo bo);
+
+    /**
+     * 新增合同条款-合同条款
+     *
+     * @param bo 合同条款-合同条款
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XzdContractClauseBo bo);
+
+    /**
+     * 修改合同条款-合同条款
+     *
+     * @param bo 合同条款-合同条款
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XzdContractClauseBo bo);
+
+    /**
+     * 校验并批量删除合同条款-合同条款信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSettlementRulesService.java

@@ -0,0 +1,70 @@
+package org.dromara.xzd.service;
+
+import org.dromara.xzd.domain.vo.XzdSettlementRulesVo;
+import org.dromara.xzd.domain.bo.XzdSettlementRulesBo;
+import org.dromara.xzd.domain.XzdSettlementRules;
+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-12
+ */
+public interface IXzdSettlementRulesService extends IService<XzdSettlementRules>{
+
+    /**
+     * 查询支付条款
+     *
+     * @param id 主键
+     * @return 支付条款
+     */
+    XzdSettlementRulesVo queryById(Long id);
+
+    /**
+     * 分页查询支付条款列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 支付条款分页列表
+     */
+    TableDataInfo<XzdSettlementRulesVo> queryPageList(XzdSettlementRulesBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的支付条款列表
+     *
+     * @param bo 查询条件
+     * @return 支付条款列表
+     */
+    List<XzdSettlementRulesVo> queryList(XzdSettlementRulesBo bo);
+
+    /**
+     * 新增支付条款
+     *
+     * @param bo 支付条款
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XzdSettlementRulesBo bo);
+
+    /**
+     * 修改支付条款
+     *
+     * @param bo 支付条款
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XzdSettlementRulesBo bo);
+
+    /**
+     * 校验并批量删除支付条款信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractClauseServiceImpl.java

@@ -0,0 +1,135 @@
+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.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.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.xzd.domain.bo.XzdContractClauseBo;
+import org.dromara.xzd.domain.vo.XzdContractClauseVo;
+import org.dromara.xzd.domain.XzdContractClause;
+import org.dromara.xzd.mapper.XzdContractClauseMapper;
+import org.dromara.xzd.service.IXzdContractClauseService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 合同条款-合同条款Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@RequiredArgsConstructor
+@Service
+public class XzdContractClauseServiceImpl extends ServiceImpl<XzdContractClauseMapper, XzdContractClause> implements IXzdContractClauseService {
+
+    private final XzdContractClauseMapper baseMapper;
+
+    /**
+     * 查询合同条款-合同条款
+     *
+     * @param id 主键
+     * @return 合同条款-合同条款
+     */
+    @Override
+    public XzdContractClauseVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询合同条款-合同条款列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同条款-合同条款分页列表
+     */
+    @Override
+    public TableDataInfo<XzdContractClauseVo> queryPageList(XzdContractClauseBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XzdContractClause> lqw = buildQueryWrapper(bo);
+        Page<XzdContractClauseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的合同条款-合同条款列表
+     *
+     * @param bo 查询条件
+     * @return 合同条款-合同条款列表
+     */
+    @Override
+    public List<XzdContractClauseVo> queryList(XzdContractClauseBo bo) {
+        LambdaQueryWrapper<XzdContractClause> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XzdContractClause> buildQueryWrapper(XzdContractClauseBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XzdContractClause> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(XzdContractClause::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getTableName()), XzdContractClause::getTableName, bo.getTableName());
+        lqw.eq(bo.getContractDetailsId() != null, XzdContractClause::getContractDetailsId, bo.getContractDetailsId());
+        lqw.eq(StringUtils.isNotBlank(bo.getContractClause()), XzdContractClause::getContractClause, bo.getContractClause());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), XzdContractClause::getContent, bo.getContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getChangeContent()), XzdContractClause::getChangeContent, bo.getChangeContent());
+        return lqw;
+    }
+
+    /**
+     * 新增合同条款-合同条款
+     *
+     * @param bo 合同条款-合同条款
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XzdContractClauseBo bo) {
+        XzdContractClause add = MapstructUtils.convert(bo, XzdContractClause.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改合同条款-合同条款
+     *
+     * @param bo 合同条款-合同条款
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XzdContractClauseBo bo) {
+        XzdContractClause update = MapstructUtils.convert(bo, XzdContractClause.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XzdContractClause entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除合同条款-合同条款信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -11,13 +11,12 @@ 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.dromara.xzd.domain.XzdContractAdvanceInfo;
+import org.dromara.ctr.domain.ContractPaymentClause;
-import org.dromara.xzd.domain.XzdDeductionItems;
+import org.dromara.xzd.domain.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.dromara.xzd.domain.bo.XzdContractDetailsBo;
 import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
-import org.dromara.xzd.domain.XzdContractDetails;
 import org.dromara.xzd.mapper.XzdContractDetailsMapper;
 import org.dromara.xzd.service.IXzdContractDetailsService;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +40,10 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
     private XzdContractAdvanceInfoServiceImpl xzdContractAdvanceInfoService;
     @Autowired
     private XzdDeductionItemsServiceImpl xzdDeductionItemsService;
+    @Autowired
+    private XzdContractClauseServiceImpl xzdContractClauseService;
+    @Autowired
+    private XzdSettlementRulesServiceImpl xzdSettlementRulesService;
 
     /**
      * 查询承包合同信息
@@ -163,7 +166,18 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
         }
         xzdDeductionItemsService.saveBatch(bo.getKkyjlx());
 
+        //合同条款-合同条款
+        for (XzdContractClause clause : bo.getHttk()) {
+            clause.setTableName(tableName);
+            clause.setContractDetailsId(add.getId());
+        }
+        xzdContractClauseService.saveBatch(bo.getHttk());
 
+        //支付条款
+        for (XzdSettlementRules clause : bo.getZftk()) {
+            clause.setContractDetailsId(add.getId());
+        }
+        xzdSettlementRulesService.saveBatch(bo.getZftk());
 
         return true;
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdDeductionItemsServiceImpl.java

@@ -1,5 +1,6 @@
 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.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSettlementRulesServiceImpl.java

@@ -0,0 +1,142 @@
+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.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.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.xzd.domain.bo.XzdSettlementRulesBo;
+import org.dromara.xzd.domain.vo.XzdSettlementRulesVo;
+import org.dromara.xzd.domain.XzdSettlementRules;
+import org.dromara.xzd.mapper.XzdSettlementRulesMapper;
+import org.dromara.xzd.service.IXzdSettlementRulesService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 支付条款Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-10-12
+ */
+@RequiredArgsConstructor
+@Service
+public class XzdSettlementRulesServiceImpl extends ServiceImpl<XzdSettlementRulesMapper, XzdSettlementRules> implements IXzdSettlementRulesService {
+
+    private final XzdSettlementRulesMapper baseMapper;
+
+    /**
+     * 查询支付条款
+     *
+     * @param id 主键
+     * @return 支付条款
+     */
+    @Override
+    public XzdSettlementRulesVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询支付条款列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 支付条款分页列表
+     */
+    @Override
+    public TableDataInfo<XzdSettlementRulesVo> queryPageList(XzdSettlementRulesBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XzdSettlementRules> lqw = buildQueryWrapper(bo);
+        Page<XzdSettlementRulesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的支付条款列表
+     *
+     * @param bo 查询条件
+     * @return 支付条款列表
+     */
+    @Override
+    public List<XzdSettlementRulesVo> queryList(XzdSettlementRulesBo bo) {
+        LambdaQueryWrapper<XzdSettlementRules> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XzdSettlementRules> buildQueryWrapper(XzdSettlementRulesBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XzdSettlementRules> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(XzdSettlementRules::getId);
+        lqw.eq(bo.getContractDetailsId() != null, XzdSettlementRules::getContractDetailsId, bo.getContractDetailsId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdSettlementRules::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getSettlementCycle()), XzdSettlementRules::getSettlementCycle, bo.getSettlementCycle());
+        lqw.eq(bo.getSettlementAging() != null, XzdSettlementRules::getSettlementAging, bo.getSettlementAging());
+        lqw.eq(StringUtils.isNotBlank(bo.getMilestoneNode()), XzdSettlementRules::getMilestoneNode, bo.getMilestoneNode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSelectValue()), XzdSettlementRules::getSelectValue, bo.getSelectValue());
+        lqw.eq(StringUtils.isNotBlank(bo.getComparisonSymbol()), XzdSettlementRules::getComparisonSymbol, bo.getComparisonSymbol());
+        lqw.eq(StringUtils.isNotBlank(bo.getComparisonValue()), XzdSettlementRules::getComparisonValue, bo.getComparisonValue());
+        lqw.eq(bo.getCollectionAging() != null, XzdSettlementRules::getCollectionAging, bo.getCollectionAging());
+        lqw.eq(bo.getCollectionBase() != null, XzdSettlementRules::getCollectionBase, bo.getCollectionBase());
+        lqw.eq(bo.getCollectionRatio() != null, XzdSettlementRules::getCollectionRatio, bo.getCollectionRatio());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), XzdSettlementRules::getRemarks, bo.getRemarks());
+        return lqw;
+    }
+
+    /**
+     * 新增支付条款
+     *
+     * @param bo 支付条款
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XzdSettlementRulesBo bo) {
+        XzdSettlementRules add = MapstructUtils.convert(bo, XzdSettlementRules.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改支付条款
+     *
+     * @param bo 支付条款
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XzdSettlementRulesBo bo) {
+        XzdSettlementRules update = MapstructUtils.convert(bo, XzdSettlementRules.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XzdSettlementRules entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除支付条款信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}